From 79ac45bc2ad2c5262d7aa1b53203dcf505e652fd Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 11 Feb 2014 12:36:24 +0100 Subject: [PATCH] re-enable multicast_querier by default So that we have same behaviour as in 2.6.32-26-pve. --- Makefile | 5 +++-- changelog.Debian | 6 ++++++ proxmox-ve/changelog.Debian | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index acc742c..ce4c466 100644 --- 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 18d1435..c0bcdf1 100644 --- 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 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 755bf04..6f4ef79 100644 --- 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 -- 2.39.2