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
commitaa2ff3f105fd37cf7ccd013705af968d0f3209b6 (patch)
tree71cbf6532c2332d4db83deb9172265e73a221099 /target/linux/generic/patches-3.14/721-phy_packets.patch
parent7c0d5b99c4c0d6bfbf974898a92373f010c4efbd (diff)
downloadupstream-aa2ff3f105fd37cf7ccd013705af968d0f3209b6.tar.gz
upstream-aa2ff3f105fd37cf7ccd013705af968d0f3209b6.tar.bz2
upstream-aa2ff3f105fd37cf7ccd013705af968d0f3209b6.zip
kernel: update 3.14 to 3.14.5
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 40901
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 */