netfilter: bridge: replace physindev with physinif in nf_bridge_info

[sfrench/cifs-2.6.git] / include / linux / netfilter_bridge.h

diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index e927b9a15a556c34ff5671db09bb98b39b353103..743475ca7e9d5132f48ee78c46b485e1018a08b3 100644 (file)
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -42,7 +42,7 @@ static inline int nf_bridge_get_physinif(const struct sk_buff *skb)
        if (!nf_bridge)
                return 0;
 
-       return nf_bridge->physindev ? nf_bridge->physindev->ifindex : 0;
+       return nf_bridge->physinif;
 }
 
 static inline int nf_bridge_get_physoutif(const struct sk_buff *skb)
@@ -60,7 +60,7 @@ nf_bridge_get_physindev(const struct sk_buff *skb, struct net *net)
 {
        const struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);
 
-       return nf_bridge ? nf_bridge->physindev : NULL;
+       return nf_bridge ? dev_get_by_index_rcu(net, nf_bridge->physinif) : NULL;
 }
 
 static inline struct net_device *