Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2 files changed, 19 insertions, 16 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index a48f5efdb6bf..cb3e97b93aeb 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -398,7 +398,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                 if (unlikely(fdb->is_local)) {
                         if (net_ratelimit())
                                 printk(KERN_WARNING "%s: received packet with "
-                                       " own address as source address\n",
+                                       "own address as source address\n",
                                        source->dev->name);
                 } else {
                         /* fastpath: update of existing entry */
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index e4a418fcb35b..d22f611e4004 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -228,6 +228,7 @@ int nf_bridge_copy_header(struct sk_buff *skb)
 static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
 {
         struct nf_bridge_info *nf_bridge = skb->nf_bridge;
+        struct rtable *rt;
 
         if (nf_bridge->mask & BRNF_PKT_TYPE) {
                 skb->pkt_type = PACKET_OTHERHOST;
@@ -235,12 +236,13 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
         }
         nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
 
-        skb->rtable = bridge_parent_rtable(nf_bridge->physindev);
-        if (!skb->rtable) {
+        rt = bridge_parent_rtable(nf_bridge->physindev);
+        if (!rt) {
                 kfree_skb(skb);
                 return 0;
         }
-        dst_hold(&skb->rtable->u.dst);
+        dst_hold(&rt->u.dst);
+        skb_dst_set(skb, &rt->u.dst);
 
         skb->dev = nf_bridge->physindev;
         nf_bridge_push_encap_header(skb);
@@ -320,7 +322,7 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
 
         skb->dev = bridge_parent(skb->dev);
         if (skb->dev) {
-                struct dst_entry *dst = skb->dst;
+                struct dst_entry *dst = skb_dst(skb);
 
                 nf_bridge_pull_encap_header(skb);
 
@@ -338,6 +340,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
         struct net_device *dev = skb->dev;
         struct iphdr *iph = ip_hdr(skb);
         struct nf_bridge_info *nf_bridge = skb->nf_bridge;
+        struct rtable *rt;
         int err;
 
         if (nf_bridge->mask & BRNF_PKT_TYPE) {
@@ -347,7 +350,6 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
         nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
         if (dnat_took_place(skb)) {
                 if ((err = ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev))) {
-                        struct rtable *rt;
                         struct flowi fl = {
                                 .nl_u = {
                                         .ip4_u = {
@@ -373,7 +375,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
                                 /* - Bridged-and-DNAT'ed traffic doesn't
                                  *   require ip_forwarding. */
                                 if (((struct dst_entry *)rt)->dev == dev) {
-                                        skb->dst = (struct dst_entry *)rt;
+                                        skb_dst_set(skb, (struct dst_entry *)rt);
                                         goto bridged_dnat;
                                 }
                                 /* we are sure that forwarding is disabled, so printing
@@ -387,7 +389,7 @@ free_skb:
                         kfree_skb(skb);
                         return 0;
                 } else {
-                        if (skb->dst->dev == dev) {
+                        if (skb_dst(skb)->dev == dev) {
 bridged_dnat:
                                 /* Tell br_nf_local_out this is a
                                  * bridged frame */
@@ -404,12 +406,13 @@ bridged_dnat:
                         skb->pkt_type = PACKET_HOST;
                 }
         } else {
-                skb->rtable = bridge_parent_rtable(nf_bridge->physindev);
-                if (!skb->rtable) {
+                rt = bridge_parent_rtable(nf_bridge->physindev);
+                if (!rt) {
                         kfree_skb(skb);
                         return 0;
                 }
-                dst_hold(&skb->rtable->u.dst);
+                dst_hold(&rt->u.dst);
+                skb_dst_set(skb, &rt->u.dst);
         }
 
         skb->dev = nf_bridge->physindev;
@@ -628,10 +631,10 @@ static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff *skb,
                                    const struct net_device *out,
                                    int (*okfn)(struct sk_buff *))
 {
-        if (skb->rtable && skb->rtable == bridge_parent_rtable(in)) {
-                dst_release(&skb->rtable->u.dst);
-                skb->rtable = NULL;
-        }
+        struct rtable *rt = skb_rtable(skb);
+
+        if (rt && rt == bridge_parent_rtable(in))
+                skb_dst_drop(skb);
 
         return NF_ACCEPT;
 }
@@ -846,7 +849,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb,
                 return NF_ACCEPT;
 
 #ifdef CONFIG_NETFILTER_DEBUG
-        if (skb->dst == NULL) {
+        if (skb_dst(skb) == NULL) {
                 printk(KERN_INFO "br_netfilter post_routing: skb->dst == NULL\n");
                 goto print_error;
         }