add patch to forward ipv6 neighbor solicitation on bridge

diff --git a/Makefile b/Makefile
index a7fc242decda9d6f0219bc7a8ed802e3a898acb0..66b1317de88aaaf22b9dae4a828fd1fa1e17b989 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.4
 
 KERNEL_VER=2.6.32
-PKGREL=148
+PKGREL=149
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=37
@@ -191,6 +191,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab105
        cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
+       cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
        #cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch
        #cd ${KERNEL_SRC}; patch -p1 <../0001-bridge-disable-querier.patch
        #cd ${KERNEL_SRC}; patch -p1 <../0002-bridge-disable-querier.patch

diff --git a/bridge-forward-ipv6-neighbor-solicitation.patch b/bridge-forward-ipv6-neighbor-solicitation.patch
new file mode 100644 (file)
index 0000000..caf5056
--- /dev/null
+++ b/bridge-forward-ipv6-neighbor-solicitation.patch
@@ -0,0 +1,17 @@
+see http://forum.proxmox.com/threads/21218-Proxmox-VE-IPv6-Problems
+
+patch from http://patchwork.ozlabs.org/patch/326048/
+
+--- linux-2.6-2.6.32/net/bridge/br_multicast.c.org     2015-03-06 06:57:00.000000000 +0100
++++ linux-2.6-2.6.32/net/bridge/br_multicast.c 2015-03-06 06:57:35.000000000 +0100
+@@ -1433,8 +1433,8 @@ static int br_multicast_ipv6_rcv(struct
+               return 0;
+ 
+       /* Prevent flooding this packet if there is no listener present */
+-      if (!ipv6_addr_is_ll_all_nodes(&ip6h->daddr))
+-              BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
++/*    if (!ipv6_addr_is_ll_all_nodes(&ip6h->daddr))
++        BR_INPUT_SKB_CB(skb)->mrouters_only = 1;*/
+ 
+       if (ip6h->nexthdr != IPPROTO_HOPOPTS ||
+           ip6h->payload_len == 0)

diff --git a/changelog.Debian b/changelog.Debian
index 5982c07c561e4568fb0a73f13536005d8517dce2..cf1954a2738a856e2a5fcdd1ee85b3cfde219eff 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-149) unstable; urgency=low
+
+  * IPv6: forwaring ICMP6 neighbor solicitation on bridge
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 06 Mar 2015 06:47:26 +0100
+
 pve-kernel-2.6.32 (2.6.32-148) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab105.6.src.rpm