disable CONFIG_BRIDGE_IGMP_SNOOPING

diff --git a/Makefile b/Makefile
index 8aa342fd7644eb745daaa8e3782c81bd8452ffd1..7a89cf094d14285c0e7bed42dd7c83ac268bcfc5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=2.3
 
 KERNEL_VER=2.6.32
-PKGREL=89
+PKGREL=90
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=19

diff --git a/README b/README
index 83079c7c0824ca06666f07f086b1adfb268c8fbc..4568ccf72a0dac41fd99f3fc9c31e77e36a04656 100644 (file)
--- a/README
+++ b/README
@@ -110,6 +110,13 @@ see config-2.6.32.diff
   Else we get warnings on boot, that
   net.bridge.bridge-nf-call-iptables is an unknown key
 
+- disable CONFIG_BRIDGE_IGMP_SNOOPING 
+
+  To avoid problems with multicasting. Various users reported
+  multipath problems, which can be avoided by turning off IGMP
+  snooping.
+
+
 Testing final kernel with kvm
 -----------------------------
 

diff --git a/changelog.Debian b/changelog.Debian
index b9ab08e7ae31541378577a10a2f5bee7d836cd13..3e69cb2f12b7abe76f13ad15365c7cc543b63c9d 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,10 @@
+pve-kernel-2.6.32 (2.6.32-90) unstable; urgency=low
+
+  * disable CONFIG_BRIDGE_IGMP_SNOOPING to avoid problems with
+    multicasting.
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 08 Mar 2013 10:55:46 +0100
+
 pve-kernel-2.6.32 (2.6.32-89) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab074.10.src.rpm

diff --git a/config-2.6.32.diff b/config-2.6.32.diff
index 4f2149dabceeabac37d010a750fb17cc45ad97c5..5c7ed946d0dda5423f7ff3df3ed2debec235e9cd 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,5 +1,5 @@
---- config-2.6.32-042stab063.2.x86_64  2012-10-24 15:05:41.000000000 +0200
-+++ config-2.6.32.new  2012-11-05 12:12:15.000000000 +0100
+--- config-2.6.32-042stab074.10.x86_64 2013-03-04 18:44:35.000000000 +0100
++++ config-2.6.32      2013-03-08 11:01:45.000000000 +0100
 @@ -210,7 +210,7 @@
  CONFIG_MODVERSIONS=y
  CONFIG_MODULE_SRCVERSION_ALL=y
@@ -9,16 +9,18 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
-@@ -944,7 +944,7 @@
+@@ -946,8 +946,8 @@
  # CONFIG_ATM_BR2684_IPFILTER is not set
  CONFIG_STP=m
  CONFIG_GARP=m
 -CONFIG_BRIDGE=m
+-CONFIG_BRIDGE_IGMP_SNOOPING=y
 +CONFIG_BRIDGE=y
- CONFIG_BRIDGE_IGMP_SNOOPING=y
++# CONFIG_BRIDGE_IGMP_SNOOPING is not set
  CONFIG_NET_DSA=y
  CONFIG_NET_DSA_TAG_DSA=y
-@@ -1362,10 +1362,10 @@
+ CONFIG_NET_DSA_TAG_EDSA=y
+@@ -1364,10 +1364,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -31,7 +33,7 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1442,7 +1442,7 @@
+@@ -1444,7 +1444,7 @@
  # CONFIG_SCSI_DMX3191D is not set
  # CONFIG_SCSI_EATA is not set
  # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -40,7 +42,7 @@
  CONFIG_SCSI_ISCI=m
  CONFIG_SCSI_IPS=m
  CONFIG_SCSI_INITIO=m
-@@ -1560,7 +1560,7 @@
+@@ -1562,7 +1562,7 @@
  # CONFIG_MULTICORE_RAID456 is not set
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
@@ -49,7 +51,7 @@
  CONFIG_DM_DEBUG=y
  CONFIG_DM_BUFIO=m
  CONFIG_DM_PERSISTENT_DATA=m
-@@ -3167,7 +3167,11 @@
+@@ -3169,7 +3169,11 @@
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
  CONFIG_LOGO_LINUX_CLUT224=y
@@ -62,7 +64,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -3770,7 +3774,9 @@
+@@ -3772,7 +3776,9 @@
  # CONFIG_SLICOSS is not set
  # CONFIG_VIDEO_GO7007 is not set
  # CONFIG_VIDEO_CX25821 is not set
@@ -73,7 +75,7 @@
  # CONFIG_W35UND is not set
  # CONFIG_PRISM2_USB is not set
  # CONFIG_ECHO is not set
-@@ -3902,7 +3908,11 @@
+@@ -3904,7 +3910,11 @@
  CONFIG_REISERFS_FS_XATTR=y
  CONFIG_REISERFS_FS_POSIX_ACL=y
  CONFIG_REISERFS_FS_SECURITY=y
@@ -86,7 +88,7 @@
  CONFIG_FS_POSIX_ACL=y
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
-@@ -3990,8 +4000,8 @@
+@@ -3992,8 +4002,8 @@
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  CONFIG_ECRYPT_FS=m
@@ -97,7 +99,7 @@
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
-@@ -4138,7 +4148,7 @@
+@@ -4140,7 +4150,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -106,7 +108,7 @@
  # CONFIG_ENABLE_WARN_DEPRECATED is not set
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4182,7 +4192,7 @@
+@@ -4184,7 +4194,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -115,7 +117,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4413,8 +4423,8 @@
+@@ -4415,8 +4425,8 @@
  #
  CONFIG_CRYPTO_ANSI_CPRNG=m
  CONFIG_CRYPTO_MPILIB=y

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index c658dad9f82d8dcdd747e35bddd13915513a02d6..5abbd446986dc1e857b482aefce48dda5e3a19fe 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,4 +1,4 @@
-proxmox-ve-2.6.32 (2.3-89) unstable; urgency=low
+proxmox-ve-2.6.32 (2.3-90) unstable; urgency=low
 
   * re-package to update version number