2 files changed, 10 insertions, 10 deletions

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 1c0efd8ad9f3..0278a069c6f1 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -223,8 +223,8 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
         }
         nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
 
-        skb->dst = (struct dst_entry *)&__fake_rtable;
-        dst_hold(skb->dst);
+        skb->rtable = &__fake_rtable;
+        dst_hold(&__fake_rtable.u.dst);
 
         skb->dev = nf_bridge->physindev;
         nf_bridge_push_encap_header(skb);
@@ -388,8 +388,8 @@ bridged_dnat:
                         skb->pkt_type = PACKET_HOST;
                 }
         } else {
-                skb->dst = (struct dst_entry *)&__fake_rtable;
-                dst_hold(skb->dst);
+                skb->rtable = &__fake_rtable;
+                dst_hold(&__fake_rtable.u.dst);
         }
 
         skb->dev = nf_bridge->physindev;
@@ -608,9 +608,9 @@ 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->dst == (struct dst_entry *)&__fake_rtable) {
-                dst_release(skb->dst);
-                skb->dst = NULL;
+        if (skb->rtable == &__fake_rtable) {
+                dst_release(&__fake_rtable.u.dst);
+                skb->rtable = NULL;
         }
 
         return NF_ACCEPT;
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 9cf0538d1717..27d6a511c8c1 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -415,21 +415,21 @@ int br_sysfs_addbr(struct net_device *dev)
         err = sysfs_create_group(brobj, &bridge_group);
         if (err) {
                 pr_info("%s: can't create group %s/%s\n",
-                        __FUNCTION__, dev->name, bridge_group.name);
+                        __func__, dev->name, bridge_group.name);
                 goto out1;
         }
 
         err = sysfs_create_bin_file(brobj, &bridge_forward);
         if (err) {
                 pr_info("%s: can't create attribute file %s/%s\n",
-                        __FUNCTION__, dev->name, bridge_forward.attr.name);
+                        __func__, dev->name, bridge_forward.attr.name);
                 goto out2;
         }
 
         br->ifobj = kobject_create_and_add(SYSFS_BRIDGE_PORT_SUBDIR, brobj);
         if (!br->ifobj) {
                 pr_info("%s: can't add kobject (directory) %s/%s\n",
-                        __FUNCTION__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
+                        __func__, dev->name, SYSFS_BRIDGE_PORT_SUBDIR);
                 goto out3;
         }
         return 0;