diff options
| author | Claudiu Manoil <claudiu.manoil@freescale.com> | 2012-08-23 23:46:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-30 18:28:17 +0200 |
| commit | e2c53be223aca36cf93eb6a0f6bafa079e78f52b (patch) | |
| tree | 77274da29ce34104756b1c9f821935071a842d2d | |
| parent | xen-netfront: use __pskb_pull_tail to ensure linear area is big enough on RX (diff) | |
| download | linux-e2c53be223aca36cf93eb6a0f6bafa079e78f52b.tar.xz linux-e2c53be223aca36cf93eb6a0f6bafa079e78f52b.zip | |
gianfar: fix default tx vlan offload feature flag
Commit -
"b852b72 gianfar: fix bug caused by
87c288c6e9aa31720b72e2bc2d665e24e1653c3e"
disables by default (on mac init) the hw vlan tag insertion.
The "features" flags were not updated to reflect this, and
"ethtool -K" shows tx-vlan-offload to be "on" by default.
Cc: Sebastian Poehn <sebastian.poehn@belden.com>
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 4605f7246687..d3233f59a82e 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1041,7 +1041,7 @@ static int gfar_probe(struct platform_device *ofdev) if (priv->device_flags & FSL_GIANFAR_DEV_HAS_VLAN) { dev->hw_features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; - dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; + dev->features |= NETIF_F_HW_VLAN_RX; } if (priv->device_flags & FSL_GIANFAR_DEV_HAS_EXTENDED_HASH) { |