aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/721-phy_packets.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
commit15a48a38b8ea48596667ef340a7d263fe74fbaa0 (patch)
treeb7feb2c8ab6c41b9e49a14d5202072ae11f53e49 /target/linux/generic/patches-3.14/721-phy_packets.patch
parent5685e23f48e1f2c4ce44b3328a431b79bab85e41 (diff)
downloadupstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.gz
upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.bz2
upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.zip
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.14/721-phy_packets.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/721-phy_packets.patch b/target/linux/generic/patches-3.14/721-phy_packets.patch
index d90462eec1..23d7b16ef4 100644
--- a/target/linux/generic/patches-3.14/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.14/721-phy_packets.patch
@@ -106,15 +106,15 @@
return rc;
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
-@@ -62,6 +62,7 @@
- #include <linux/scatterlist.h>
+@@ -63,6 +63,7 @@
#include <linux/errqueue.h>
#include <linux/prefetch.h>
+ #include <linux/if_vlan.h>
+#include <linux/if.h>
#include <net/protocol.h>
#include <net/dst.h>
-@@ -439,6 +440,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -440,6 +441,22 @@ struct sk_buff *__netdev_alloc_skb(struc
}
EXPORT_SYMBOL(__netdev_alloc_skb);