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 | b011293d0be54dc724039acb0450dc8a6666ba32 (patch) | |
| tree | 53fd6c3483b758f5e3c4a1e8377f475f1a7fc8c0 /target/linux/generic/patches-3.18/721-phy_packets.patch | |
| parent | 17afb853eec6dc4f39f0815831379be004f98cc5 (diff) | |
| download | upstream-b011293d0be54dc724039acb0450dc8a6666ba32.tar.gz upstream-b011293d0be54dc724039acb0450dc8a6666ba32.tar.bz2 upstream-b011293d0be54dc724039acb0450dc8a6666ba32.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>
SVN-Revision: 44877
Diffstat (limited to 'target/linux/generic/patches-3.18/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/721-phy_packets.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 5d989741a6..aa1897cad9 100644 --- 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; |