aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-12-23 21:46:17 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-12-24 17:45:54 +0100
commit25b422a0412d88345c911875fd4413c46c913d4e (patch)
tree74339fb2ca8a7aa94d2530295df9a459ab77ba7f /target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch
parentf0df0d6a1472d8d3692998de6b42bd17287d04e9 (diff)
downloadupstream-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/643-net-bridge-support-hardware-flow-table-offload.patch')
-rw-r--r--target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch4
1 files changed, 2 insertions, 2 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,