Re: [patch net-next-2.6 04/47] nes: do vlan cleanup
From: Michał Mirosław <hidden>
Date: 2011-07-20 15:45:27
From: Michał Mirosław <hidden>
Date: 2011-07-20 15:45:27
2011/7/20 Jiri Pirko [off-list ref]:
- unify vlan and nonvlan rx path - kill nesvnic->vlan_grp and nes_netdev_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool (set_features)
[...]
/**@@ -1656,7 +1679,7 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,netdev->ethtool_ops = &nes_ethtool_ops; netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128); nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n"); - netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; + netdev->features |= NETIF_F_HW_VLAN_TX;
Just remove this line - nes_fix_features() is controlling the flag anyway. Best Regards, Michał Mirosław