diff options
| author | Mugunthan V N <mugunthanvnm@ti.com> | 2014-04-09 02:04:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-09 14:55:37 -0400 |
| commit | 629c9a8fd0bbdfc6d702526b327470166ec39c6b (patch) | |
| tree | d0c94a48c8d40a33a8ee77ea27226831f18384dd /drivers/net | |
| parent | fa8cddaf903c0e010ff2de210ea4974fa30603ef (diff) | |
drivers: net: cpsw: Add default vlan for dual emac case also
Dual EMAC works with VLAN segregation of the ports, so default vlan needs
to be added in dual EMAC case else default vlan will be tagged for all
egress packets and vlan unaware switches/servers will drop packets
from the EVM.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 5d5fec6c4eb0..6133e4af9975 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
| @@ -1201,8 +1201,7 @@ static int cpsw_ndo_open(struct net_device *ndev) | |||
| 1201 | for_each_slave(priv, cpsw_slave_open, priv); | 1201 | for_each_slave(priv, cpsw_slave_open, priv); |
| 1202 | 1202 | ||
| 1203 | /* Add default VLAN */ | 1203 | /* Add default VLAN */ |
| 1204 | if (!priv->data.dual_emac) | 1204 | cpsw_add_default_vlan(priv); |
| 1205 | cpsw_add_default_vlan(priv); | ||
| 1206 | 1205 | ||
| 1207 | if (!cpsw_common_res_usage_state(priv)) { | 1206 | if (!cpsw_common_res_usage_state(priv)) { |
| 1208 | /* setup tx dma to fixed prio and zero offset */ | 1207 | /* setup tx dma to fixed prio and zero offset */ |