diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/gianfar.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 835cd2588148..2659daad783d 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -388,12 +388,8 @@ static void gfar_init_mac(struct net_device *ndev) | |||
388 | if (priv->hwts_rx_en) | 388 | if (priv->hwts_rx_en) |
389 | rctrl |= RCTRL_PRSDEP_INIT | RCTRL_TS_ENABLE; | 389 | rctrl |= RCTRL_PRSDEP_INIT | RCTRL_TS_ENABLE; |
390 | 390 | ||
391 | /* keep vlan related bits if it's enabled */ | ||
392 | if (ndev->features & NETIF_F_HW_VLAN_TX) | ||
393 | rctrl |= RCTRL_VLEX | RCTRL_PRSDEP_INIT; | ||
394 | |||
395 | if (ndev->features & NETIF_F_HW_VLAN_RX) | 391 | if (ndev->features & NETIF_F_HW_VLAN_RX) |
396 | tctrl |= TCTRL_VLINS; | 392 | rctrl |= RCTRL_VLEX | RCTRL_PRSDEP_INIT; |
397 | 393 | ||
398 | /* Init rctrl based on our settings */ | 394 | /* Init rctrl based on our settings */ |
399 | gfar_write(®s->rctrl, rctrl); | 395 | gfar_write(®s->rctrl, rctrl); |