diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-04-04 15:37:25 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-04-04 15:37:25 -0700 |
| commit | ca712e47054678c5ce93a0e0f686353ad5561195 (patch) | |
| tree | 575dd9f2e541ddd74b72e82dfe69c5badcb9e281 /drivers/net/ipvlan | |
| parent | 24b18197184ac39bb8566fb82c0bf788bcd0d45b (diff) | |
| parent | abf04be0e7071f2bcd39bf97ba407e7d4439785e (diff) | |
Merge branch 'for-6.3/cxl-doe-fixes' into for-6.3/cxl
Pick up the fixes (first 6 patches) from the DOE rework series from
Lukas for v6.3-rc.
Link: https://lore.kernel.org/all/cover.1678543498.git.lukas@wunner.de/
Diffstat (limited to 'drivers/net/ipvlan')
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_l3s.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ipvlan/ipvlan_l3s.c b/drivers/net/ipvlan/ipvlan_l3s.c index 943d26cbf39f..71712ea25403 100644 --- a/drivers/net/ipvlan/ipvlan_l3s.c +++ b/drivers/net/ipvlan/ipvlan_l3s.c @@ -101,6 +101,7 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, goto out; skb->dev = addr->master->dev; + skb->skb_iif = skb->dev->ifindex; len = skb->len + ETH_HLEN; ipvlan_count_rx(addr->master, len, true, false); out: |