diff options
| author | Claudiu Manoil <claudiu.manoil@freescale.com> | 2012-08-23 21:46:25 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 10:29:38 -0700 |
| commit | c5ca1d03c29df5dc550f71bd1669af8bc30e32f8 (patch) | |
| tree | 961fa011bc1dcfddef5088cce7516834ff87a11e /drivers | |
| parent | fa1dcb6f0d338629cf1e3939227135ce0ea17b50 (diff) | |
| download | linux-3.10-c5ca1d03c29df5dc550f71bd1669af8bc30e32f8.tar.gz linux-3.10-c5ca1d03c29df5dc550f71bd1669af8bc30e32f8.tar.bz2 linux-3.10-c5ca1d03c29df5dc550f71bd1669af8bc30e32f8.zip | |
gianfar: fix default tx vlan offload feature flag
[ Upstream commit e2c53be223aca36cf93eb6a0f6bafa079e78f52b ]
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>
Diffstat (limited to 'drivers')
| -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 24381e1298e..0819a740384 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1037,7 +1037,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) { |