diff options
author | Anish Bhatt <anish@chelsio.com> | 2014-10-14 23:07:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-15 00:28:58 -0400 |
commit | 587ddfe2d212019de7c921d9c010789828893f86 (patch) | |
tree | c7d2a94791cdb66ebf46bcaf65b61355225a4b2c /drivers/net/ethernet/chelsio | |
parent | 9b462d02d6dd671a9ebdc45caed6fe98a53c0ebe (diff) |
cxgb4i : Remove duplicated CLIP handling code
cxgb4 already handles CLIP updates from a previous changeset for iw_cxgb4,
there is no need to have this functionality in cxgb4i. Remove duplicated code
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index fed8f26ee67b..411acf0268fb 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
@@ -4490,6 +4490,13 @@ static int update_root_dev_clip(struct net_device *dev) | |||
4490 | return ret; | 4490 | return ret; |
4491 | 4491 | ||
4492 | /* Parse all bond and vlan devices layered on top of the physical dev */ | 4492 | /* Parse all bond and vlan devices layered on top of the physical dev */ |
4493 | root_dev = netdev_master_upper_dev_get_rcu(dev); | ||
4494 | if (root_dev) { | ||
4495 | ret = update_dev_clip(root_dev, dev); | ||
4496 | if (ret) | ||
4497 | return ret; | ||
4498 | } | ||
4499 | |||
4493 | for (i = 0; i < VLAN_N_VID; i++) { | 4500 | for (i = 0; i < VLAN_N_VID; i++) { |
4494 | root_dev = __vlan_find_dev_deep_rcu(dev, htons(ETH_P_8021Q), i); | 4501 | root_dev = __vlan_find_dev_deep_rcu(dev, htons(ETH_P_8021Q), i); |
4495 | if (!root_dev) | 4502 | if (!root_dev) |