diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:22:41 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:22:41 +0000 |
commit | 1eb74d2c55dfcb60ed3d4a557bd360680695ffbc (patch) | |
tree | 7cd84a087ab09abdbd3ef6914d4eeb165ec9a12c /target/linux/generic/patches-4.0/721-phy_packets.patch | |
parent | 5d4be21553ddc62ac97b9698c656829d7e814ee1 (diff) | |
download | master-187ad058-1eb74d2c55dfcb60ed3d4a557bd360680695ffbc.tar.gz master-187ad058-1eb74d2c55dfcb60ed3d4a557bd360680695ffbc.tar.bz2 master-187ad058-1eb74d2c55dfcb60ed3d4a557bd360680695ffbc.zip |
kernel: replace GRO optimization patch with a new one that supports VLANs/bridges with different MAC addresses
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44877 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/721-phy_packets.patch')
-rw-r--r-- | target/linux/generic/patches-4.0/721-phy_packets.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.0/721-phy_packets.patch b/target/linux/generic/patches-4.0/721-phy_packets.patch index 30dde5e935..1ace035a1b 100644 --- a/target/linux/generic/patches-4.0/721-phy_packets.patch +++ b/target/linux/generic/patches-4.0/721-phy_packets.patch @@ -28,7 +28,7 @@ const struct header_ops *header_ops; unsigned int flags; -@@ -1619,6 +1626,10 @@ struct net_device { +@@ -1621,6 +1628,10 @@ struct net_device { struct wireless_dev *ieee80211_ptr; struct wpan_dev *ieee802154_ptr; @@ -41,7 +41,7 @@ */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2049,6 +2049,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2050,6 +2050,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 -@@ -2175,16 +2179,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2176,16 +2180,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -121,7 +121,7 @@ #include <net/protocol.h> #include <net/dst.h> -@@ -550,6 +551,22 @@ struct sk_buff *__napi_alloc_skb(struct +@@ -550,6 +551,22 @@ struct sk_buff *__napi_alloc_skb(struct } EXPORT_SYMBOL(__napi_alloc_skb); @@ -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; |