| From: Claudiu Manoil <claudiu.manoil@freescale.com> |
| Date: Thu, 23 Aug 2012 21:46:25 +0000 |
| Subject: 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/ethernet/freescale/gianfar.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c |
| index 83199fd..d0722a7 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) { |
