diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2014-03-27 09:28:33 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2014-03-27 09:28:33 +0000 |
| commit | 627baa28d33ca202e0f79e9a2a8eb6bc9d823a1a (patch) | |
| tree | 72d6e2a751ac1c6e7b846d285867e11225fca13a /target/linux/generic | |
| parent | b68564ed3fd56d381886c08fc4b2640dd15b46ba (diff) | |
| download | upstream-627baa28d33ca202e0f79e9a2a8eb6bc9d823a1a.tar.gz upstream-627baa28d33ca202e0f79e9a2a8eb6bc9d823a1a.tar.bz2 upstream-627baa28d33ca202e0f79e9a2a8eb6bc9d823a1a.zip | |
kernel: update 3.10 to 3.10.34
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 40291
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-3.10/721-phy_packets.patch | 8 |
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 e21e272183..dcdd10283d 100644 --- a/target/linux/generic/patches-3.10/721-phy_packets.patch +++ b/target/linux/generic/patches-3.10/721-phy_packets.patch @@ -79,7 +79,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2576,9 +2576,19 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -2581,9 +2581,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; -@@ -2594,9 +2604,19 @@ gso: +@@ -2599,9 +2609,19 @@ gso: if (!list_empty(&ptype_all)) dev_queue_xmit_nit(nskb, dev); @@ -127,7 +127,7 @@ goto out_kfree_gso_skb; --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -60,6 +60,7 @@ +@@ -62,6 +62,7 @@ #include <linux/scatterlist.h> #include <linux/errqueue.h> #include <linux/prefetch.h> @@ -135,7 +135,7 @@ #include <net/protocol.h> #include <net/dst.h> -@@ -441,6 +442,22 @@ struct sk_buff *__netdev_alloc_skb(struc +@@ -443,6 +444,22 @@ struct sk_buff *__netdev_alloc_skb(struc } EXPORT_SYMBOL(__netdev_alloc_skb); |