diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-01 13:45:57 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-01 13:45:57 +0000 |
| commit | 55a912f43e9762638e3b3d0fc640d903f29ba8b7 (patch) | |
| tree | 80f32338e0470a97524f0617bf835586004d810c /target/linux/generic/patches-3.18/721-phy_packets.patch | |
| parent | 9130e4dc3267e4d1f25e22cddf798991bc6197cf (diff) | |
| download | upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.tar.gz upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.tar.bz2 upstream-55a912f43e9762638e3b3d0fc640d903f29ba8b7.zip | |
kernel: update kernel 3.18 to version 3.18.23
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47334
Diffstat (limited to 'target/linux/generic/patches-3.18/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/721-phy_packets.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/721-phy_packets.patch b/target/linux/generic/patches-3.18/721-phy_packets.patch index 7616817f9b..99811c6242 100644 --- a/target/linux/generic/patches-3.18/721-phy_packets.patch +++ b/target/linux/generic/patches-3.18/721-phy_packets.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1220,6 +1220,7 @@ enum netdev_priv_flags { +@@ -1228,6 +1228,7 @@ enum netdev_priv_flags { IFF_LIVE_ADDR_CHANGE = 1<<20, IFF_MACVLAN = 1<<21, IFF_XMIT_DST_RELEASE_PERM = 1<<22, @@ -8,7 +8,7 @@ }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1245,6 +1246,7 @@ enum netdev_priv_flags { +@@ -1253,6 +1254,7 @@ enum netdev_priv_flags { #define IFF_LIVE_ADDR_CHANGE IFF_LIVE_ADDR_CHANGE #define IFF_MACVLAN IFF_MACVLAN #define IFF_XMIT_DST_RELEASE_PERM IFF_XMIT_DST_RELEASE_PERM @@ -16,7 +16,7 @@ /** * struct net_device - The DEVICE structure. -@@ -1515,6 +1517,11 @@ struct net_device { +@@ -1523,6 +1525,11 @@ struct net_device { const struct ethtool_ops *ethtool_ops; const struct forwarding_accel_ops *fwd_ops; @@ -28,7 +28,7 @@ const struct header_ops *header_ops; unsigned int flags; -@@ -1579,6 +1586,10 @@ struct net_device { +@@ -1587,6 +1594,10 @@ struct net_device { void *ax25_ptr; struct wireless_dev *ieee80211_ptr; |