anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "net: fix dev_fill_forward_path with pppoe + bridge"

Browse Source 
This reverts commit f96b2e0672.

It breaks the ABI and will be brought in through a different branch to
preserve it.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I729afbaefb667bd9e73260efb83c68e434e5bce6
This commit is contained in:
Greg Kroah-Hartman
2022-06-10 08:53:32 +02:00
parent 201784f31a
commit d938cd00a4
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ppp/pppoe.c
View File

@@ -988,7 +988,6 @@ static int pppoe_fill_forward_path(struct net_device_path_ctx *ctx,
path->encap.proto = htons(ETH_P_PPP_SES);
path->encap.id = be16_to_cpu(po->num);
memcpy(path->encap.h_dest, po->pppoe_pa.remote, ETH_ALEN);
memcpy(ctx->daddr, po->pppoe_pa.remote, ETH_ALEN);
path->dev = ctx->dev;
ctx->dev = dev;

2
include/linux/netdevice.h
View File

@@ -887,7 +887,7 @@ struct net_device_path_stack {
struct net_device_path_ctx {
const struct net_device *dev;
u8 daddr[ETH_ALEN];
const u8 *daddr;
int num_vlans;
struct {

2
net/core/dev.c
View File

@@ -748,11 +748,11 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,
const struct net_device *last_dev;
struct net_device_path_ctx ctx = {
.dev = dev,
.daddr = daddr,
};
struct net_device_path *path;
int ret = 0;
memcpy(ctx.daddr, daddr, sizeof(ctx.daddr));
stack->num_paths = 0;
while (ctx.dev && ctx.dev->netdev_ops->ndo_fill_forward_path) {
last_dev = ctx.dev;