Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4ada8db38a44654446fe35ceb20a1972220e0f69

Authored by David Miller
Committed by Linus Torvalds
1 parent 20b4fb4852
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

net: Restore NETIF_F_* bit ordering. 

Commit 8ad227ff89a7 ("net: vlan: add 802.1ad support") added some new
NETIF_F_* features bits, but it added them in the middle of existing
values.

Userland depends upon the flag bits via the per-netdevice 'flags' sysfs
file.

So restore the previous ordering by adding the new flags at the end.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

include/linux/netdev_features.h
Diff comments   View file @ 4ada8db
... ... @@ -25,9 +25,6 @@
25 25 NETIF_F_HW_VLAN_CTAG_TX_BIT, /* Transmit VLAN CTAG HW acceleration */
26 26 NETIF_F_HW_VLAN_CTAG_RX_BIT, /* Receive VLAN CTAG HW acceleration */
27 27 NETIF_F_HW_VLAN_CTAG_FILTER_BIT,/* Receive filtering on VLAN CTAGs */
28   - NETIF_F_HW_VLAN_STAG_TX_BIT, /* Transmit VLAN STAG HW acceleration */
29   - NETIF_F_HW_VLAN_STAG_RX_BIT, /* Receive VLAN STAG HW acceleration */
30   - NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */
31 28 NETIF_F_VLAN_CHALLENGED_BIT, /* Device cannot handle VLAN packets */
32 29 NETIF_F_GSO_BIT, /* Enable software GSO. */
33 30 NETIF_F_LLTX_BIT, /* LockLess TX - deprecated. Please */
... ... @@ -59,6 +56,9 @@
59 56 NETIF_F_LOOPBACK_BIT, /* Enable loopback */
60 57 NETIF_F_RXFCS_BIT, /* Append FCS to skb pkt data */
61 58 NETIF_F_RXALL_BIT, /* Receive errored frames too */
  59 + NETIF_F_HW_VLAN_STAG_TX_BIT, /* Transmit VLAN STAG HW acceleration */
  60 + NETIF_F_HW_VLAN_STAG_RX_BIT, /* Receive VLAN STAG HW acceleration */
  61 + NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */
62 62  
63 63 /*
64 64 * Add your fresh new feature above and remember to update
... ... @@ -86,9 +86,6 @@
86 86 #define NETIF_F_HW_VLAN_CTAG_FILTER __NETIF_F(HW_VLAN_CTAG_FILTER)
87 87 #define NETIF_F_HW_VLAN_CTAG_RX __NETIF_F(HW_VLAN_CTAG_RX)
88 88 #define NETIF_F_HW_VLAN_CTAG_TX __NETIF_F(HW_VLAN_CTAG_TX)
89   -#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)
90   -#define NETIF_F_HW_VLAN_STAG_RX __NETIF_F(HW_VLAN_STAG_RX)
91   -#define NETIF_F_HW_VLAN_STAG_TX __NETIF_F(HW_VLAN_STAG_TX)
92 89 #define NETIF_F_IP_CSUM __NETIF_F(IP_CSUM)
93 90 #define NETIF_F_IPV6_CSUM __NETIF_F(IPV6_CSUM)
94 91 #define NETIF_F_LLTX __NETIF_F(LLTX)
... ... @@ -110,6 +107,9 @@
110 107 #define NETIF_F_RXALL __NETIF_F(RXALL)
111 108 #define NETIF_F_GSO_GRE __NETIF_F(GSO_GRE)
112 109 #define NETIF_F_GSO_UDP_TUNNEL __NETIF_F(GSO_UDP_TUNNEL)
  110 +#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)
  111 +#define NETIF_F_HW_VLAN_STAG_RX __NETIF_F(HW_VLAN_STAG_RX)
  112 +#define NETIF_F_HW_VLAN_STAG_TX __NETIF_F(HW_VLAN_STAG_TX)
113 113  
114 114 /* Features valid for ethtool to change */
115 115 /* = all defined minus driver/device-class-related */