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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41992 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 b6344f4..e781f76 100644 (file)
--- 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 04b5b3a..d90462e 100644 (file)
--- 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 */