diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-11-04 22:28:40 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-11-04 22:28:40 +0000 |
| commit | 122fadaa003cf6fa969076e147ee11b690de684b (patch) | |
| tree | 8b3c205ab6c0a0f4f2007995484465975408674b /target/linux/generic/patches-4.3/721-phy_packets.patch | |
| parent | b8b4d363797192a416f08327753842550fd13ea3 (diff) | |
| download | master-31e0f0ae-122fadaa003cf6fa969076e147ee11b690de684b.tar.gz master-31e0f0ae-122fadaa003cf6fa969076e147ee11b690de684b.tar.bz2 master-31e0f0ae-122fadaa003cf6fa969076e147ee11b690de684b.zip | |
kernel: update kernel 4.3-rc7 to version 4.3
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 47384
Diffstat (limited to 'target/linux/generic/patches-4.3/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-4.3/721-phy_packets.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.3/721-phy_packets.patch b/target/linux/generic/patches-4.3/721-phy_packets.patch index e83eadb7f9..b7e04abcde 100644 --- a/target/linux/generic/patches-4.3/721-phy_packets.patch +++ b/target/linux/generic/patches-4.3/721-phy_packets.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1286,6 +1286,7 @@ enum netdev_priv_flags { +@@ -1292,6 +1292,7 @@ enum netdev_priv_flags { IFF_VRF_MASTER = 1<<20, IFF_NO_QUEUE = 1<<21, IFF_OPENVSWITCH = 1<<22, @@ -8,7 +8,7 @@ }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1311,6 +1312,7 @@ enum netdev_priv_flags { +@@ -1317,6 +1318,7 @@ enum netdev_priv_flags { #define IFF_VRF_MASTER IFF_VRF_MASTER #define IFF_NO_QUEUE IFF_NO_QUEUE #define IFF_OPENVSWITCH IFF_OPENVSWITCH @@ -16,7 +16,7 @@ /** * struct net_device - The DEVICE structure. -@@ -1588,6 +1590,11 @@ struct net_device { +@@ -1594,6 +1596,11 @@ struct net_device { const struct switchdev_ops *switchdev_ops; #endif @@ -28,7 +28,7 @@ const struct header_ops *header_ops; unsigned int flags; -@@ -1655,6 +1662,10 @@ struct net_device { +@@ -1661,6 +1668,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2678,10 +2678,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2705,10 +2705,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); |