kernel/3.1{3, 4}: fix IFF_NO_IP_ALIGN flag location

Fix IFF_NO_IP_ALIGN location which is collide with new netdev private flag
IFF_MACVLAN.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 41992
This commit is contained in:
Felix Fietkau 2014-08-04 06:15:14 +00:00
parent 17b8d9c976
commit e6083fc8b1
2 changed files with 2 additions and 2 deletions

View file

@ -28,7 +28,7 @@
#define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address
* change when it's running */
#define IFF_MACVLAN 0x200000 /* Macvlan device */
+#define IFF_NO_IP_ALIGN 0x200000 /* do not ip-align allocated rx pkts */
+#define IFF_NO_IP_ALIGN 0x400000 /* do not ip-align allocated rx pkts */
#define IF_GET_IFACE 0x0001 /* for querying only */

View file

@ -28,7 +28,7 @@
#define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address
* change when it's running */
#define IFF_MACVLAN 0x200000 /* Macvlan device */
+#define IFF_NO_IP_ALIGN 0x200000 /* do not ip-align allocated rx pkts */
+#define IFF_NO_IP_ALIGN 0x400000 /* do not ip-align allocated rx pkts */
#define IF_GET_IFACE 0x0001 /* for querying only */