aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/721-phy_packets.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-06-02 09:25:33 +0000
committerLuka Perkov <luka@openwrt.org>2014-06-02 09:25:33 +0000
commite23676609bb3f2502b7e2ebf82c07ef26d7be810 (patch)
treeb0b2c2439140e501cc6178891d37bc78c42fdc79 /target/linux/generic/patches-3.14/721-phy_packets.patch
parentf1f2e5a8ba2f214fe09e8ee53bbc5516c316160c (diff)
downloadupstream-e23676609bb3f2502b7e2ebf82c07ef26d7be810.tar.gz
upstream-e23676609bb3f2502b7e2ebf82c07ef26d7be810.tar.bz2
upstream-e23676609bb3f2502b7e2ebf82c07ef26d7be810.zip
kernel: update 3.14 to 3.14.5
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40901 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.patch4
1 files changed, 2 insertions, 2 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 3421e4dc21..e472a96280 100644
--- a/target/linux/generic/patches-3.14/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.14/721-phy_packets.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1244,6 +1244,11 @@ struct net_device {
+@@ -1245,6 +1245,11 @@ struct net_device {
const struct ethtool_ops *ethtool_ops;
const struct forwarding_accel_ops *fwd_ops;
@@ -12,7 +12,7 @@
/* Hardware header description */
const struct header_ops *header_ops;
-@@ -1312,6 +1317,9 @@ struct net_device {
+@@ -1313,6 +1318,9 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */