diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-23 21:46:17 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 17:45:54 +0100 |
| commit | 25b422a0412d88345c911875fd4413c46c913d4e (patch) | |
| tree | 74339fb2ca8a7aa94d2530295df9a459ab77ba7f /target/linux/generic/pending-4.14 | |
| parent | f0df0d6a1472d8d3692998de6b42bd17287d04e9 (diff) | |
| download | upstream-25b422a0412d88345c911875fd4413c46c913d4e.tar.gz upstream-25b422a0412d88345c911875fd4413c46c913d4e.tar.bz2 upstream-25b422a0412d88345c911875fd4413c46c913d4e.zip | |
kernel: bump 4.14 to 4.14.160
Refreshed all patches.
Compile-tested on: ipq40xx, apm821xx
Runtime-tested on: ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14')
| -rw-r--r-- | target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch index a070fe1636..b54d3cb48f 100644 --- a/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <linux/uaccess.h> #include "br_private.h" -@@ -340,6 +344,28 @@ static const struct ethtool_ops br_ethto +@@ -346,6 +350,28 @@ static const struct ethtool_ops br_ethto .get_link = ethtool_op_get_link, }; @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static const struct net_device_ops br_netdev_ops = { .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, -@@ -367,6 +393,9 @@ static const struct net_device_ops br_ne +@@ -373,6 +399,9 @@ static const struct net_device_ops br_ne .ndo_bridge_setlink = br_setlink, .ndo_bridge_dellink = br_dellink, .ndo_features_check = passthru_features_check, diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index f76c39ac18..8919ea34ec 100644 --- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1766,6 +1766,8 @@ struct net_device { +@@ -1771,6 +1771,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6969,6 +7016,7 @@ int dev_set_mac_address(struct net_devic +@@ -6970,6 +7017,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |