From a6ed5c6848bda0b19e8734b4a4a734ecde31130d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 9 Jun 2013 13:38:05 +0200 Subject: [PATCH] backports: alx driver now uses NETIF_F_HW_VLAN_CTAG_* This was/will be renamed in the alx driver, this patch makes backports work with alx again. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- .../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 e550439d5f45..a0a9c1f71422 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); -- 2.30.2