aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.13/721-phy_packets.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-03-26 11:34:39 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-03-26 11:34:39 +0000
commitb8e295aa7b5c4fcc4c0de34af8e04b39ac871d18 (patch)
treef43ed0b70feae0973e7cdd459a7c7133152910c0 /target/linux/generic/patches-3.13/721-phy_packets.patch
parent608f4fe3b040089b30a019f1a28efeda1ca5809f (diff)
downloadupstream-b8e295aa7b5c4fcc4c0de34af8e04b39ac871d18.tar.gz
upstream-b8e295aa7b5c4fcc4c0de34af8e04b39ac871d18.tar.bz2
upstream-b8e295aa7b5c4fcc4c0de34af8e04b39ac871d18.zip
upgrade 3.13 targets to 3.13.7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 40022
Diffstat (limited to 'target/linux/generic/patches-3.13/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.13/721-phy_packets.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.13/721-phy_packets.patch b/target/linux/generic/patches-3.13/721-phy_packets.patch
index 7b4902f20e..b6344f431b 100644
--- a/target/linux/generic/patches-3.13/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.13/721-phy_packets.patch
@@ -79,7 +79,7 @@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2604,10 +2604,20 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2606,10 +2606,20 @@ int dev_hard_start_xmit(struct sk_buff *
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
@@ -105,7 +105,7 @@
return rc;
--- 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>
@@ -113,7 +113,7 @@
#include <net/protocol.h>
#include <net/dst.h>
-@@ -466,6 +467,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -438,6 +439,22 @@ struct sk_buff *__netdev_alloc_skb(struc
}
EXPORT_SYMBOL(__netdev_alloc_skb);