diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-07 11:34:28 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-08 17:27:47 +0100 |
commit | 9a3599de2ca15c7ffa1667a41c4579ef9898dae9 (patch) | |
tree | c0d15140478657a54b2d983dc9bed926209fd9d3 /target/linux/generic/hack-4.19/721-phy_packets.patch | |
parent | 89bf16ad503d73e4444a2a766526ba645f76134b (diff) | |
download | upstream-9a3599de2ca15c7ffa1667a41c4579ef9898dae9.tar.gz upstream-9a3599de2ca15c7ffa1667a41c4579ef9898dae9.tar.bz2 upstream-9a3599de2ca15c7ffa1667a41c4579ef9898dae9.zip |
kernel: bump 4.19 to 4.19.20
Refreshed all patches.
Remove upstreamed:
- 100-arm-cns3xxx-fix-writing-to-wrong-PCI-registers-after.patch
Altered patches:
- 721-phy_packets.patch
Compile-tested on: imx6
Runtime-tested on: imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.19/721-phy_packets.patch')
-rw-r--r-- | target/linux/generic/hack-4.19/721-phy_packets.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/hack-4.19/721-phy_packets.patch b/target/linux/generic/hack-4.19/721-phy_packets.patch index 108aba121d..8267eadac8 100644 --- a/target/linux/generic/hack-4.19/721-phy_packets.patch +++ b/target/linux/generic/hack-4.19/721-phy_packets.patch @@ -15,23 +15,23 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1510,6 +1510,7 @@ enum netdev_priv_flags { - IFF_NO_RX_HANDLER = 1<<26, +@@ -1512,6 +1512,7 @@ enum netdev_priv_flags { IFF_FAILOVER = 1<<27, IFF_FAILOVER_SLAVE = 1<<28, -+ IFF_NO_IP_ALIGN = 1<<29, + IFF_L3MDEV_RX_HANDLER = 1<<29, ++ IFF_NO_IP_ALIGN = 1<<30, }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1540,6 +1541,7 @@ enum netdev_priv_flags { - #define IFF_NO_RX_HANDLER IFF_NO_RX_HANDLER +@@ -1543,6 +1544,7 @@ enum netdev_priv_flags { #define IFF_FAILOVER IFF_FAILOVER #define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE + #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN /** * struct net_device - The DEVICE structure. -@@ -1838,6 +1840,11 @@ struct net_device { +@@ -1841,6 +1843,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; -@@ -1913,6 +1920,10 @@ struct net_device { +@@ -1916,6 +1923,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif |