diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-02-08 12:01:37 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-02-08 12:01:37 +0000 |
| commit | b9d513158ee3b0b16cd6b17eb50774be4ab33386 (patch) | |
| tree | 37fa855efcfdce3577686daade94a7eadfaccd9a /target/linux/generic/patches-3.18/721-phy_packets.patch | |
| parent | e972c95cf096c6d10cf69a10316fed32b11493cb (diff) | |
| download | upstream-b9d513158ee3b0b16cd6b17eb50774be4ab33386.tar.gz upstream-b9d513158ee3b0b16cd6b17eb50774be4ab33386.tar.bz2 upstream-b9d513158ee3b0b16cd6b17eb50774be4ab33386.zip | |
kernel: update 3.18 to 3.18.6
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 44318
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 | 10 |
1 files changed, 5 insertions, 5 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 0e21ff3080..5d989741a6 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 -@@ -1216,6 +1216,7 @@ enum netdev_priv_flags { +@@ -1220,6 +1220,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 -@@ -1241,6 +1242,7 @@ enum netdev_priv_flags { +@@ -1245,6 +1246,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. -@@ -1511,6 +1513,11 @@ struct net_device { +@@ -1515,6 +1517,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; -@@ -1573,6 +1580,10 @@ struct net_device { +@@ -1577,6 +1584,10 @@ struct net_device { void *ax25_ptr; struct wireless_dev *ieee80211_ptr; @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2607,10 +2607,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2623,10 +2623,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all)) dev_queue_xmit_nit(skb, dev); |