Changeset 44877


Ignore:
Timestamp:
2015-03-18T19:22:41+01:00 (3 years ago)
Author:
nbd
Message:

kernel: replace GRO optimization patch with a new one that supports VLANs/bridges with different MAC addresses

Signed-off-by: Felix Fietkau <nbd@…>

Location:
trunk/target/linux/generic
Files:
3 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.18/721-phy_packets.patch

    r44318 r44877  
    2929  
    3030        unsigned int            flags; 
    31 @@ -1577,6 +1584,10 @@ struct net_device { 
     31@@ -1579,6 +1586,10 @@ struct net_device { 
    3232        void                    *ax25_ptr; 
    3333        struct wireless_dev     *ieee80211_ptr; 
     
    4242--- a/include/linux/skbuff.h 
    4343+++ b/include/linux/skbuff.h 
    44 @@ -2052,6 +2052,10 @@ static inline int pskb_trim(struct sk_bu 
     44@@ -2053,6 +2053,10 @@ static inline int pskb_trim(struct sk_bu 
    4545        return (len < skb->len) ? __pskb_trim(skb, len) : 0; 
    4646 } 
     
    5353  *     pskb_trim_unique - remove end from a paged unique (not cloned) buffer 
    5454  *     @skb: buffer to alter 
    55 @@ -2178,16 +2182,6 @@ static inline struct sk_buff *dev_alloc_ 
     55@@ -2179,16 +2183,6 @@ static inline struct sk_buff *dev_alloc_ 
    5656 } 
    5757  
     
    147147--- a/net/ethernet/eth.c 
    148148+++ b/net/ethernet/eth.c 
    149 @@ -188,6 +188,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
     149@@ -200,6 +200,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
    150150        const struct ethhdr *eth; 
    151151  
  • trunk/target/linux/generic/patches-3.19/721-phy_packets.patch

    r44381 r44877  
    2929  
    3030        unsigned int            flags; 
    31 @@ -1613,6 +1620,10 @@ struct net_device { 
     31@@ -1615,6 +1622,10 @@ struct net_device { 
    3232        struct wireless_dev     *ieee80211_ptr; 
    3333        struct wpan_dev         *ieee802154_ptr; 
     
    4242--- a/include/linux/skbuff.h 
    4343+++ b/include/linux/skbuff.h 
    44 @@ -2042,6 +2042,10 @@ static inline int pskb_trim(struct sk_bu 
     44@@ -2043,6 +2043,10 @@ static inline int pskb_trim(struct sk_bu 
    4545        return (len < skb->len) ? __pskb_trim(skb, len) : 0; 
    4646 } 
     
    5353  *     pskb_trim_unique - remove end from a paged unique (not cloned) buffer 
    5454  *     @skb: buffer to alter 
    55 @@ -2168,16 +2172,6 @@ static inline struct sk_buff *dev_alloc_ 
     55@@ -2169,16 +2173,6 @@ static inline struct sk_buff *dev_alloc_ 
    5656 } 
    5757  
     
    122122 #include <net/protocol.h> 
    123123 #include <net/dst.h> 
    124 @@ -548,6 +549,22 @@ struct sk_buff *__napi_alloc_skb(struct 
     124@@ -548,6 +549,22 @@ struct sk_buff *__napi_alloc_skb(struct  
    125125 } 
    126126 EXPORT_SYMBOL(__napi_alloc_skb); 
     
    147147--- a/net/ethernet/eth.c 
    148148+++ b/net/ethernet/eth.c 
    149 @@ -188,6 +188,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
     149@@ -200,6 +200,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
    150150        const struct ethhdr *eth; 
    151151  
  • trunk/target/linux/generic/patches-4.0/721-phy_packets.patch

    r44511 r44877  
    2929  
    3030        unsigned int            flags; 
    31 @@ -1619,6 +1626,10 @@ struct net_device { 
     31@@ -1621,6 +1628,10 @@ struct net_device { 
    3232        struct wireless_dev     *ieee80211_ptr; 
    3333        struct wpan_dev         *ieee802154_ptr; 
     
    4242--- a/include/linux/skbuff.h 
    4343+++ b/include/linux/skbuff.h 
    44 @@ -2049,6 +2049,10 @@ static inline int pskb_trim(struct sk_bu 
     44@@ -2050,6 +2050,10 @@ static inline int pskb_trim(struct sk_bu 
    4545        return (len < skb->len) ? __pskb_trim(skb, len) : 0; 
    4646 } 
     
    5353  *     pskb_trim_unique - remove end from a paged unique (not cloned) buffer 
    5454  *     @skb: buffer to alter 
    55 @@ -2175,16 +2179,6 @@ static inline struct sk_buff *dev_alloc_ 
     55@@ -2176,16 +2180,6 @@ static inline struct sk_buff *dev_alloc_ 
    5656 } 
    5757  
     
    122122 #include <net/protocol.h> 
    123123 #include <net/dst.h> 
    124 @@ -550,6 +551,22 @@ struct sk_buff *__napi_alloc_skb(struct 
     124@@ -550,6 +551,22 @@ struct sk_buff *__napi_alloc_skb(struct  
    125125 } 
    126126 EXPORT_SYMBOL(__napi_alloc_skb); 
     
    147147--- a/net/ethernet/eth.c 
    148148+++ b/net/ethernet/eth.c 
    149 @@ -188,6 +188,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
     149@@ -200,6 +200,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
    150150        const struct ethhdr *eth; 
    151151  
Note: See TracChangeset for help on using the changeset viewer.