Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/

2 files changed, 8 insertions, 9 deletions

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 47122728212a..922549581abc 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -406,8 +406,7 @@ ipv6_invert_rthdr(struct sock *sk, struct ipv6_rt_hdr *hdr)
 
         memcpy(opt->srcrt, hdr, sizeof(*hdr));
         irthdr = (struct rt0_hdr*)opt->srcrt;
-        /* Obsolete field, MBZ, when originated by us */
-        irthdr->bitmap = 0;
+        irthdr->reserved = 0;
         opt->srcrt->segments_left = n;
         for (i=0; i<n; i++)
                 memcpy(irthdr->addr+i, rthdr->addr+(n-1-i), 16);
diff --git a/net/ipv6/netfilter/ip6t_rt.c b/net/ipv6/netfilter/ip6t_rt.c
index a9526b773d28..2bb670037df3 100644
--- a/net/ipv6/netfilter/ip6t_rt.c
+++ b/net/ipv6/netfilter/ip6t_rt.c
@@ -161,8 +161,8 @@ match(const struct sk_buff *skb,
                            ((rtinfo->hdrlen == hdrlen) ^
                            !!(rtinfo->invflags & IP6T_RT_INV_LEN))));
        DEBUGP("res %02X %02X %02X ", 
-                (rtinfo->flags & IP6T_RT_RES), ((struct rt0_hdr *)rh)->bitmap,
-                !((rtinfo->flags & IP6T_RT_RES) && (((struct rt0_hdr *)rh)->bitmap)));
+                (rtinfo->flags & IP6T_RT_RES), ((struct rt0_hdr *)rh)->reserved,
+                !((rtinfo->flags & IP6T_RT_RES) && (((struct rt0_hdr *)rh)->reserved)));
 
        ret = (rh != NULL)
                 &&
@@ -179,12 +179,12 @@ match(const struct sk_buff *skb,
                            !!(rtinfo->invflags & IP6T_RT_INV_TYP)));
 
         if (ret && (rtinfo->flags & IP6T_RT_RES)) {
-                u_int32_t *bp, _bitmap;
-                bp = skb_header_pointer(skb,
-                                        ptr + offsetof(struct rt0_hdr, bitmap),
-                                        sizeof(_bitmap), &_bitmap);
+                u_int32_t *rp, _reserved;
+                rp = skb_header_pointer(skb,
+                                        ptr + offsetof(struct rt0_hdr, reserved),
+                                        sizeof(_reserved), &_reserved);
 
-                ret = (*bp == 0);
+                ret = (*rp == 0);
         }
 
         DEBUGP("#%d ",rtinfo->addrnr);