[PATCH 3/5] backports: alx driver now uses NETIF_F_HW_VLAN_CTAG_*

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This was/will be renamed in the alx driver, this patch makes backports
work with alx again.

Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
 patches/unified-drivers/network/0001-backport-alx/alx.patch |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/unified-drivers/network/0001-backport-alx/alx.patch b/patches/unified-drivers/network/0001-backport-alx/alx.patch
index e550439..a0a9c1f 100644
--- a/patches/unified-drivers/network/0001-backport-alx/alx.patch
+++ b/patches/unified-drivers/network/0001-backport-alx/alx.patch
@@ -84,17 +84,17 @@
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
  	netdev->hw_features = NETIF_F_SG	 |
  			      NETIF_F_HW_CSUM	 |
- 			      NETIF_F_HW_VLAN_RX |
+ 			      NETIF_F_HW_VLAN_CTAG_RX |
  			      NETIF_F_TSO        |
  			      NETIF_F_TSO6;
- 	netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX;
+ 	netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_CTAG_TX;
 +#else
 +	netdev->features = NETIF_F_SG            |
 +			   NETIF_F_HW_CSUM       |
-+			   NETIF_F_HW_VLAN_RX    |
++			   NETIF_F_HW_VLAN_CTAG_RX    |
 +			   NETIF_F_TSO           |
 +			   NETIF_F_TSO6          |
-+			   NETIF_F_HW_VLAN_TX;
++			   NETIF_F_HW_VLAN_CTAG_TX;
 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */
  
  	/* read permanent mac addr from register or eFuse */
@@ -120,4 +120,4 @@
 +#endif
  };
  
- 
+ module_pci_driver(alx_driver);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux