diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 06:54:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 22:47:55 +0200 |
| commit | 87c288c6e9aa31720b72e2bc2d665e24e1653c3e (patch) | |
| tree | 18706b96ee67715b400868da1da3a46fff5e596e /drivers/net/gianfar_ethtool.c | |
| parent | enic: do vlan cleanup (diff) | |
| download | linux-87c288c6e9aa31720b72e2bc2d665e24e1653c3e.tar.xz linux-87c288c6e9aa31720b72e2bc2d665e24e1653c3e.zip | |
gianfar: do vlan cleanup
- unify vlan and nonvlan rx path
- kill priv->vlgrp and gfar_vlan_rx_register
- allow to turn on/off rx/tx vlan accel via ethtool
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar_ethtool.c')
| -rw-r--r-- | drivers/net/gianfar_ethtool.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index 203369cc1272..6e350692d118 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c @@ -526,6 +526,9 @@ int gfar_set_features(struct net_device *dev, u32 features) int err = 0, i = 0; u32 changed = dev->features ^ features; + if (changed & (NETIF_F_HW_VLAN_TX|NETIF_F_HW_VLAN_RX)) + gfar_vlan_mode(dev, features); + if (!(changed & NETIF_F_RXCSUM)) return 0; |