diff options
author | dingtianhong <dingtianhong@huawei.com> | 2014-05-09 02:58:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-12 14:39:13 -0400 |
commit | f06c7f9f92295faf701a9628b383156c4efb6119 (patch) | |
tree | 93d816c8e3d78f4252c4f32cf57a6626c36496f3 /net | |
parent | 60ff746739bf805a912484643c720b6124826140 (diff) |
vlan: rename __vlan_find_dev_deep() to __vlan_find_dev_deep_rcu()
The __vlan_find_dev_deep should always called in RCU, according
David's suggestion, rename to __vlan_find_dev_deep_rcu looks more
reasonable.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/8021q/vlan_core.c | 6 | ||||
-rw-r--r-- | net/bridge/br_netfilter.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 3c32bd257b73..9012b1c922b6 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c | |||
@@ -63,7 +63,7 @@ bool vlan_do_receive(struct sk_buff **skbp) | |||
63 | } | 63 | } |
64 | 64 | ||
65 | /* Must be invoked with rcu_read_lock. */ | 65 | /* Must be invoked with rcu_read_lock. */ |
66 | struct net_device *__vlan_find_dev_deep(struct net_device *dev, | 66 | struct net_device *__vlan_find_dev_deep_rcu(struct net_device *dev, |
67 | __be16 vlan_proto, u16 vlan_id) | 67 | __be16 vlan_proto, u16 vlan_id) |
68 | { | 68 | { |
69 | struct vlan_info *vlan_info = rcu_dereference(dev->vlan_info); | 69 | struct vlan_info *vlan_info = rcu_dereference(dev->vlan_info); |
@@ -81,13 +81,13 @@ struct net_device *__vlan_find_dev_deep(struct net_device *dev, | |||
81 | 81 | ||
82 | upper_dev = netdev_master_upper_dev_get_rcu(dev); | 82 | upper_dev = netdev_master_upper_dev_get_rcu(dev); |
83 | if (upper_dev) | 83 | if (upper_dev) |
84 | return __vlan_find_dev_deep(upper_dev, | 84 | return __vlan_find_dev_deep_rcu(upper_dev, |
85 | vlan_proto, vlan_id); | 85 | vlan_proto, vlan_id); |
86 | } | 86 | } |
87 | 87 | ||
88 | return NULL; | 88 | return NULL; |
89 | } | 89 | } |
90 | EXPORT_SYMBOL(__vlan_find_dev_deep); | 90 | EXPORT_SYMBOL(__vlan_find_dev_deep_rcu); |
91 | 91 | ||
92 | struct net_device *vlan_dev_real_dev(const struct net_device *dev) | 92 | struct net_device *vlan_dev_real_dev(const struct net_device *dev) |
93 | { | 93 | { |
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 2acf7fa1fec6..a615264cf01a 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -535,7 +535,7 @@ static struct net_device *brnf_get_logical_dev(struct sk_buff *skb, const struct | |||
535 | if (brnf_pass_vlan_indev == 0 || !vlan_tx_tag_present(skb)) | 535 | if (brnf_pass_vlan_indev == 0 || !vlan_tx_tag_present(skb)) |
536 | return br; | 536 | return br; |
537 | 537 | ||
538 | vlan = __vlan_find_dev_deep(br, skb->vlan_proto, | 538 | vlan = __vlan_find_dev_deep_rcu(br, skb->vlan_proto, |
539 | vlan_tx_tag_get(skb) & VLAN_VID_MASK); | 539 | vlan_tx_tag_get(skb) & VLAN_VID_MASK); |
540 | 540 | ||
541 | return vlan ? vlan : br; | 541 | return vlan ? vlan : br; |