kernel: replace GRO optimization patch with a new one that supports VLANs/bridges...

[openwrt/staging/chunkeey.git] / target / linux / generic / patches-3.18 / 721-phy_packets.patch

diff --git a/target/linux/generic/patches-3.18/721-phy_packets.patch b/target/linux/generic/patches-3.18/721-phy_packets.patch
index 5d989741a6a1fbd42138f8ee405fbb56d8958195..aa1897cad9656c1c2bf6d95339f164c11e5891ab 100644 (file)
--- a/target/linux/generic/patches-3.18/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.18/721-phy_packets.patch
@@ -28,7 +28,7 @@
        const struct header_ops *header_ops;
  
        unsigned int            flags;
-@@ -1577,6 +1584,10 @@ struct net_device {
+@@ -1579,6 +1586,10 @@ struct net_device {
        void                    *ax25_ptr;
        struct wireless_dev     *ieee80211_ptr;
  
@@ -41,7 +41,7 @@
   */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2052,6 +2052,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2053,6 +2053,10 @@ static inline int pskb_trim(struct sk_bu
        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
@@ -52,7 +52,7 @@
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter
-@@ -2178,16 +2182,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2179,16 +2183,6 @@ static inline struct sk_buff *dev_alloc_
  }
  
  
@@ -146,7 +146,7 @@
  {
 --- a/net/ethernet/eth.c
 +++ b/net/ethernet/eth.c
-@@ -188,6 +188,12 @@ __be16 eth_type_trans(struct sk_buff *sk
+@@ -200,6 +200,12 @@ __be16 eth_type_trans(struct sk_buff *sk
        const struct ethhdr *eth;
  
        skb->dev = dev;