diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-08-04 06:15:14 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-08-04 06:15:14 +0000 |
| commit | e6083fc8b100bb09f0e7a0db533c74ad73cb504f (patch) | |
| tree | 895b6d4402d338ba94b7865dfd7a2f26d3fd391c | |
| parent | 17b8d9c976f7011db426550f7930856626284bf8 (diff) | |
| download | upstream-e6083fc8b100bb09f0e7a0db533c74ad73cb504f.tar.gz upstream-e6083fc8b100bb09f0e7a0db533c74ad73cb504f.tar.bz2 upstream-e6083fc8b100bb09f0e7a0db533c74ad73cb504f.zip | |
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
| -rw-r--r-- | target/linux/generic/patches-3.13/721-phy_packets.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.14/721-phy_packets.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.13/721-phy_packets.patch b/target/linux/generic/patches-3.13/721-phy_packets.patch index b6344f431b..e781f76542 100644 --- a/target/linux/generic/patches-3.13/721-phy_packets.patch +++ b/target/linux/generic/patches-3.13/721-phy_packets.patch @@ -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 */ diff --git a/target/linux/generic/patches-3.14/721-phy_packets.patch b/target/linux/generic/patches-3.14/721-phy_packets.patch index 04b5b3af56..d90462eec1 100644 --- a/target/linux/generic/patches-3.14/721-phy_packets.patch +++ b/target/linux/generic/patches-3.14/721-phy_packets.patch @@ -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 */ |