diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-03-09 12:39:35 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-03-09 20:43:53 +0100 |
| commit | f9f62d43e448f58d25749efa8b2aabc7f2d51e53 (patch) | |
| tree | 6a69f28d11895bd28e04b580981b23ca3cc7943e /target/linux/generic/hack-5.4/721-phy_packets.patch | |
| parent | e64564920a9fa164e9657942de35333d4299abe0 (diff) | |
| download | upstream-f9f62d43e448f58d25749efa8b2aabc7f2d51e53.tar.gz upstream-f9f62d43e448f58d25749efa8b2aabc7f2d51e53.tar.bz2 upstream-f9f62d43e448f58d25749efa8b2aabc7f2d51e53.zip | |
kernel: bump 5.4 to 5.4.24
Refreshed all patches.
Compile-tested on: imx6
Runtime-tested on: imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-5.4/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/hack-5.4/721-phy_packets.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch index 89f113a1c8..a04529e6e4 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1544,6 +1544,7 @@ enum netdev_priv_flags { +@@ -1546,6 +1546,7 @@ enum netdev_priv_flags { IFF_FAILOVER_SLAVE = 1<<28, IFF_L3MDEV_RX_HANDLER = 1<<29, IFF_LIVE_RENAME_OK = 1<<30, @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1576,6 +1577,7 @@ enum netdev_priv_flags { +@@ -1578,6 +1579,7 @@ enum netdev_priv_flags { #define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER #define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK @@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * struct net_device - The DEVICE structure. -@@ -1877,6 +1879,11 @@ struct net_device { +@@ -1879,6 +1881,11 @@ struct net_device { const struct tlsdev_ops *tlsdev_ops; #endif @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> const struct header_ops *header_ops; unsigned int flags; -@@ -1959,6 +1966,10 @@ struct net_device { +@@ -1961,6 +1968,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3194,10 +3194,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -3193,10 +3193,20 @@ static int xmit_one(struct sk_buff *skb, if (dev_nit_active(dev)) dev_queue_xmit_nit(skb, dev); |