generic: backport a fix for the input keymap-matrix module

[openwrt.git] / target / linux / generic / patches-3.6 / 721-phy_packets.patch

diff --git a/target/linux/generic/patches-3.6/721-phy_packets.patch b/target/linux/generic/patches-3.6/721-phy_packets.patch
index c99e64e2433998e5c3f116ab5bcc928308cf9ade..3a0fdc95b36938d7374879da44156e24fe4b0afb 100644 (file)
--- a/target/linux/generic/patches-3.6/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.6/721-phy_packets.patch
@@ -28,13 +28,13 @@
  #define IFF_SUPP_NOFCS        0x80000         /* device supports sending custom FCS */
  #define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address
                                         * change when it's running */
-+#define IFF_NO_IP_ALIGN       0x120000        /* do not ip-align allocated rx pkts */
++#define IFF_NO_IP_ALIGN       0x200000        /* do not ip-align allocated rx pkts */
  
  
  #define IF_GET_IFACE  0x0001          /* for querying only */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1656,6 +1656,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1653,6 +1653,10 @@ static inline int pskb_trim(struct sk_bu
        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
@@ -45,7 +45,7 @@
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter
-@@ -1758,16 +1762,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1755,16 +1759,6 @@ static inline struct sk_buff *dev_alloc_
  }