diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-07 11:10:31 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-08 17:27:47 +0100 |
| commit | 89bf16ad503d73e4444a2a766526ba645f76134b (patch) | |
| tree | f7189f9ac78b871c942ca943c6eeb093797400f8 /target/linux/generic/hack-4.14 | |
| parent | 34e80b5d3b736c5cbabb5a77541cc40e9fe38d5a (diff) | |
| download | upstream-89bf16ad503d73e4444a2a766526ba645f76134b.tar.gz upstream-89bf16ad503d73e4444a2a766526ba645f76134b.tar.bz2 upstream-89bf16ad503d73e4444a2a766526ba645f76134b.zip | |
kernel: bump 4.14 to 4.14.98
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: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14')
| -rw-r--r-- | target/linux/generic/hack-4.14/721-phy_packets.patch | 14 | ||||
| -rw-r--r-- | target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index d27d94e046..fb977b10d4 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/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 -@@ -1410,6 +1410,7 @@ enum netdev_priv_flags { - IFF_RXFH_CONFIGURED = 1<<25, +@@ -1412,6 +1412,7 @@ enum netdev_priv_flags { IFF_PHONY_HEADROOM = 1<<26, IFF_MACSEC = 1<<27, -+ IFF_NO_IP_ALIGN = 1<<28, + IFF_L3MDEV_RX_HANDLER = 1<<28, ++ IFF_NO_IP_ALIGN = 1<<29, }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1439,6 +1440,7 @@ enum netdev_priv_flags { - #define IFF_TEAM IFF_TEAM +@@ -1442,6 +1443,7 @@ enum netdev_priv_flags { #define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED #define IFF_MACSEC IFF_MACSEC + #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN /** * struct net_device - The DEVICE structure. -@@ -1725,6 +1727,11 @@ struct net_device { +@@ -1728,6 +1730,11 @@ struct net_device { const struct xfrmdev_ops *xfrmdev_ops; #endif @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> const struct header_ops *header_ops; unsigned int flags; -@@ -1794,6 +1801,10 @@ struct net_device { +@@ -1797,6 +1804,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif diff --git a/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch index abacfc390a..19400af189 100644 --- a/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch +++ b/target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #ifdef CONFIG_UEVENT_HELPER /* path to the userspace helper executed on an event */ extern char uevent_helper[]; -@@ -224,4 +226,7 @@ int kobject_synth_uevent(struct kobject +@@ -241,4 +243,7 @@ int kobject_synth_uevent(struct kobject __printf(2, 3) int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...); |