aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2022-02-16 20:32:27 +0100
committerFelix Fietkau <nbd@nbd.name>2022-02-16 20:38:59 +0100
commitadb65008c859ebbe3b2c923ab11eba1d5f560e3e (patch)
tree038ed3609d5aeded31ffa2a94e450edc0690e2fd /target/linux/generic/pending-5.4
parentb7af850bd2a944d01ee2f30b79062fed025e9a02 (diff)
downloadupstream-adb65008c859ebbe3b2c923ab11eba1d5f560e3e.tar.gz
upstream-adb65008c859ebbe3b2c923ab11eba1d5f560e3e.tar.bz2
upstream-adb65008c859ebbe3b2c923ab11eba1d5f560e3e.zip
kernel: backport fix for initializing skb->cb in the bridge code to 5.4
Fixes issues with proxyarp Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry-picked from commit dabc78b644c0fb8f17ff5456f6cb92e78b53f248)
Diffstat (limited to 'target/linux/generic/pending-5.4')
-rw-r--r--target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch
index d47482dc67..fcfac748cb 100644
--- a/target/linux/generic/pending-5.4/643-net-bridge-support-hardware-flow-table-offload.patch
+++ b/target/linux/generic/pending-5.4/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"
-@@ -382,6 +386,28 @@ static const struct ethtool_ops br_ethto
+@@ -384,6 +388,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,
-@@ -410,6 +436,9 @@ static const struct net_device_ops br_ne
+@@ -412,6 +438,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,