diff options
author | dingtianhong <dingtianhong@huawei.com> | 2014-05-09 14:58:05 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-12 14:39:13 -0400 |
commit | f06c7f9f92295faf701a9628b383156c4efb6119 (patch) | |
tree | 93d816c8e3d78f4252c4f32cf57a6626c36496f3 /net/8021q | |
parent | 60ff746739bf805a912484643c720b6124826140 (diff) | |
download | op-kernel-dev-f06c7f9f92295faf701a9628b383156c4efb6119.zip op-kernel-dev-f06c7f9f92295faf701a9628b383156c4efb6119.tar.gz |
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/8021q')
-rw-r--r-- | net/8021q/vlan_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 3c32bd2..9012b1c 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) } /* Must be invoked with rcu_read_lock. */ -struct net_device *__vlan_find_dev_deep(struct net_device *dev, +struct net_device *__vlan_find_dev_deep_rcu(struct net_device *dev, __be16 vlan_proto, u16 vlan_id) { 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, upper_dev = netdev_master_upper_dev_get_rcu(dev); if (upper_dev) - return __vlan_find_dev_deep(upper_dev, + return __vlan_find_dev_deep_rcu(upper_dev, vlan_proto, vlan_id); } return NULL; } -EXPORT_SYMBOL(__vlan_find_dev_deep); +EXPORT_SYMBOL(__vlan_find_dev_deep_rcu); struct net_device *vlan_dev_real_dev(const struct net_device *dev) { |