mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
6c945fa379
Removed upstreamed:
bcm53xx/patches-5.10/033-v5.16-0024-ARM-dts-BCM5301X-Fix-I2C-controller-interrupt.patch[1]
bcm53xx/patches-5.10/033-v5.16-0025-ARM-dts-BCM5301X-Add-interrupt-properties-to-GPIO-no.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=b2cd6fdcbe0a5cb44e4610a08cc58261d494a885
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=9db1d4a3c2700e1cc84c3d61199411d75c2a3ec6
Build system: x86_64*
Build-tested: bcm2711/RPi4B, ipq806x/R7800†
Run-tested: bcm2711/RPi4B, ipq806x/R7800†
* Had to revert 7c99085bd6 in order to build
(latest bump of ca-certificates)
† Had to revert 7f1edbd412 in order to build
(binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)
Signed-off-by: John Audia <graysky@archlinux.us>
81 lines
2.0 KiB
Diff
81 lines
2.0 KiB
Diff
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Wed, 24 Mar 2021 02:30:33 +0100
|
|
Subject: [PATCH] net: 8021q: resolve forwarding path for vlan devices
|
|
|
|
Add .ndo_fill_forward_path for vlan devices.
|
|
|
|
For instance, assuming the following topology:
|
|
|
|
IP forwarding
|
|
/ \
|
|
eth0.100 eth0
|
|
|
|
|
eth0
|
|
.
|
|
.
|
|
.
|
|
ethX
|
|
ab:cd:ef:ab:cd:ef
|
|
|
|
For packets going through IP forwarding to eth0.100 whose destination
|
|
MAC address is ab:cd:ef:ab:cd:ef, dev_fill_forward_path() provides the
|
|
following path:
|
|
|
|
eth0.100 -> eth0
|
|
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
|
|
--- a/include/linux/netdevice.h
|
|
+++ b/include/linux/netdevice.h
|
|
@@ -829,11 +829,18 @@ typedef u16 (*select_queue_fallback_t)(s
|
|
|
|
enum net_device_path_type {
|
|
DEV_PATH_ETHERNET = 0,
|
|
+ DEV_PATH_VLAN,
|
|
};
|
|
|
|
struct net_device_path {
|
|
enum net_device_path_type type;
|
|
const struct net_device *dev;
|
|
+ union {
|
|
+ struct {
|
|
+ u16 id;
|
|
+ __be16 proto;
|
|
+ } encap;
|
|
+ };
|
|
};
|
|
|
|
#define NET_DEVICE_PATH_STACK_MAX 5
|
|
--- a/net/8021q/vlan_dev.c
|
|
+++ b/net/8021q/vlan_dev.c
|
|
@@ -770,6 +770,20 @@ static int vlan_dev_get_iflink(const str
|
|
return real_dev->ifindex;
|
|
}
|
|
|
|
+static int vlan_dev_fill_forward_path(struct net_device_path_ctx *ctx,
|
|
+ struct net_device_path *path)
|
|
+{
|
|
+ struct vlan_dev_priv *vlan = vlan_dev_priv(ctx->dev);
|
|
+
|
|
+ path->type = DEV_PATH_VLAN;
|
|
+ path->encap.id = vlan->vlan_id;
|
|
+ path->encap.proto = vlan->vlan_proto;
|
|
+ path->dev = ctx->dev;
|
|
+ ctx->dev = vlan->real_dev;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static const struct ethtool_ops vlan_ethtool_ops = {
|
|
.get_link_ksettings = vlan_ethtool_get_link_ksettings,
|
|
.get_drvinfo = vlan_ethtool_get_drvinfo,
|
|
@@ -808,6 +822,7 @@ static const struct net_device_ops vlan_
|
|
#endif
|
|
.ndo_fix_features = vlan_dev_fix_features,
|
|
.ndo_get_iflink = vlan_dev_get_iflink,
|
|
+ .ndo_fill_forward_path = vlan_dev_fill_forward_path,
|
|
};
|
|
|
|
static void vlan_dev_free(struct net_device *dev)
|