diff options
| author | dingtianhong <dingtianhong@huawei.com> | 2014-05-09 08:58:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-12 20:39:13 +0200 |
| commit | f06c7f9f92295faf701a9628b383156c4efb6119 (patch) | |
| tree | 93d816c8e3d78f4252c4f32cf57a6626c36496f3 /net/bridge | |
| parent | net: rename local_df to ignore_df (diff) | |
| download | linux-f06c7f9f92295faf701a9628b383156c4efb6119.tar.xz linux-f06c7f9f92295faf701a9628b383156c4efb6119.zip | |
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/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 if (brnf_pass_vlan_indev == 0 || !vlan_tx_tag_present(skb)) return br; - vlan = __vlan_find_dev_deep(br, skb->vlan_proto, + vlan = __vlan_find_dev_deep_rcu(br, skb->vlan_proto, vlan_tx_tag_get(skb) & VLAN_VID_MASK); return vlan ? vlan : br; |