summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.8/721-phy_packets.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-06 11:40:44 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-06 11:40:44 +0000
commitf3ecabebdb5e8ae1ba209ef30cf867dc7ed8ae74 (patch)
treeeadd7469d3c7acf63c58ddfacd13a68feb0f4e2c /target/linux/generic/patches-3.8/721-phy_packets.patch
parent73a7b1a5c8e06d4dd01733efdd79a6c72d48f2a4 (diff)
kernel: update linux 3.8 to 3.8.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36215 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.8/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.8/721-phy_packets.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.8/721-phy_packets.patch b/target/linux/generic/patches-3.8/721-phy_packets.patch
index 21e2291f6c..73ca2e007c 100644
--- a/target/linux/generic/patches-3.8/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.8/721-phy_packets.patch
@@ -34,7 +34,7 @@
#define IF_GET_IFACE 0x0001 /* for querying only */
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -1752,6 +1752,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1757,6 +1757,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
-@@ -1854,16 +1858,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1859,16 +1863,6 @@ static inline struct sk_buff *dev_alloc_
}
@@ -79,7 +79,7 @@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2361,9 +2361,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2360,9 +2360,19 @@ int dev_hard_start_xmit(struct sk_buff *
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
@@ -102,7 +102,7 @@
if (rc == NETDEV_TX_OK)
txq_trans_update(txq);
return rc;
-@@ -2386,9 +2396,19 @@ gso:
+@@ -2385,9 +2395,19 @@ gso:
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(nskb, dev);