Reenabled linux-xen, added patches for Xen Kernel Version 2.6.27.31,

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.fixes / fix-nf_conntrack_slp

diff --git a/src/patches/suse-2.6.27.31/patches.fixes/fix-nf_conntrack_slp b/src/patches/suse-2.6.27.31/patches.fixes/fix-nf_conntrack_slp
new file mode 100644 (file)
index 0000000..4f6f280
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.fixes/fix-nf_conntrack_slp
@@ -0,0 +1,62 @@
+From: Ludwig Nussel <lnussel@novell.com>
+Subject: make nf_conntrack_slp actually work
+References: bnc#470963
+
+Acked-by: Jeff Mahoney <jeffm@suse.com>
+---
+
+ nf_conntrack_slp.c |   17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+--- a/net/netfilter/nf_conntrack_slp.c
++++ b/net/netfilter/nf_conntrack_slp.c
+@@ -47,15 +47,15 @@ static int help(struct sk_buff *skb, uns
+               struct nf_conn *ct, enum ip_conntrack_info ctinfo)
+ {
+       struct nf_conntrack_expect *exp;
+-      struct iphdr *iph = ip_hdr(skb);
+       struct rtable *rt = skb->rtable;
+       struct in_device *in_dev;
+       __be32 mask = 0;
++      __be32 src = 0;
+ 
+       /* we're only interested in locally generated packets */
+       if (skb->sk == NULL)
+               goto out;
+-      if (rt == NULL || !(rt->rt_flags & RTCF_BROADCAST))
++      if (rt == NULL || !(rt->rt_flags & (RTCF_MULTICAST|RTCF_BROADCAST)))
+               goto out;
+       if (CTINFO2DIR(ctinfo) != IP_CT_DIR_ORIGINAL)
+               goto out;
+@@ -64,15 +64,18 @@ static int help(struct sk_buff *skb, uns
+       in_dev = __in_dev_get_rcu(rt->u.dst.dev);
+       if (in_dev != NULL) {
+               for_primary_ifa(in_dev) {
+-                      if (ifa->ifa_broadcast == iph->daddr) {
+-                              mask = ifa->ifa_mask;
+-                              break;
+-                      }
++                      /* this is a hack as slp uses multicast we can't match
++                       * the destination address to some broadcast address. So
++                       * just take the first one. Better would be to install
++                       * expectations for all addresses */
++                      mask = ifa->ifa_mask;
++                      src = ifa->ifa_broadcast;
++                      break;
+               } endfor_ifa(in_dev);
+       }
+       rcu_read_unlock();
+ 
+-      if (mask == 0)
++      if (mask == 0 || src == 0)
+               goto out;
+ 
+       exp = nf_ct_expect_alloc(ct);
+@@ -80,6 +83,7 @@ static int help(struct sk_buff *skb, uns
+               goto out;
+ 
+       exp->tuple                = ct->tuplehash[IP_CT_DIR_REPLY].tuple;
++      exp->tuple.src.u3.ip      = src;
+       exp->tuple.src.u.udp.port = htons(SLP_PORT);
+ 
+       exp->mask.src.u3.ip       = mask;