aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/721-phy_packets.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-07-01 13:21:06 +0000
committerJonas Gorski <jogo@openwrt.org>2013-07-01 13:21:06 +0000
commit96f8c15a36dbdde14df63e2e7dfea7a819716428 (patch)
treefe53bc1a1631dfd020746d97fea1de756b26f5e0 /target/linux/generic/patches-3.10/721-phy_packets.patch
parent7e19bb1854415df8fb65c017a0d2d64fd6a83bd1 (diff)
downloadupstream-96f8c15a36dbdde14df63e2e7dfea7a819716428.tar.gz
upstream-96f8c15a36dbdde14df63e2e7dfea7a819716428.tar.bz2
upstream-96f8c15a36dbdde14df63e2e7dfea7a819716428.zip
kernel: update linux 3.10 to 3.10 final
3.10 final is out, so refresh patches and add md5sum. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37116
Diffstat (limited to 'target/linux/generic/patches-3.10/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.10/721-phy_packets.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.10/721-phy_packets.patch b/target/linux/generic/patches-3.10/721-phy_packets.patch
index e9b599608c..869200787f 100644
--- a/target/linux/generic/patches-3.10/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.10/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
-@@ -1877,6 +1877,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1878,6 +1878,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
-@@ -2001,16 +2005,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2002,16 +2006,6 @@ static inline struct sk_buff *dev_alloc_
}
@@ -79,7 +79,7 @@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2542,9 +2542,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2576,9 +2576,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;
-@@ -2560,9 +2570,19 @@ gso:
+@@ -2594,9 +2604,19 @@ gso:
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(nskb, dev);