re-enable multicast_querier by default

So that we have same behaviour as in 2.6.32-26-pve.

diff --git a/Makefile b/Makefile
index acc742c0853265e8ebce48e2d57836b141171cd2..ce4c466533ee6e3e902369afd350e57a24dd228d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.1
 
 KERNEL_VER=2.6.32
-PKGREL=119
+PKGREL=120
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=27
@@ -160,7 +160,8 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        #cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-disable-querier.patch
        #cd ${KERNEL_SRC}; patch -p1 <../0003-bridge-disable-querier.patch
        #cd ${KERNEL_SRC}; patch -p1 <../0004-bridge-disable-querier.patch
-       #cd ${KERNEL_SRC}; patch -p1 <../0005-bridge-disable-querier.patch
+       # this enable querier by default
+       cd ${KERNEL_SRC}; patch -p1 <../0005-bridge-disable-querier.patch 
        #cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-only-expire-the-mdb-entry-when-query-is-recei.patch
        #cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-send-query-as-soon-as-leave-is-received.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch

diff --git a/changelog.Debian b/changelog.Debian
index 18d1435ff6e0112113834cd6be21f2b3ccd5948e..c0bcdf1101bb035ee15647c3e3d1671d2e78573b 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-120) unstable; urgency=low
+
+  * re-enable multicast_querier by default (as in 2.6.32-26-pve)
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 11 Feb 2014 12:35:20 +0100
+
 pve-kernel-2.6.32 (2.6.32-119) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab084.17.src.rpm

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index 755bf0447de8184747a5e5a9e8cf4bbb11cbaef9..6f4ef7932fc401bf0df7241a0df964868d80e50f 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,4 +1,4 @@
-proxmox-ve-2.6.32 (3.1-119) unstable; urgency=low
+proxmox-ve-2.6.32 (3.1-120) unstable; urgency=low
 
   * re-package to update version number for 3.1 release