diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 08:44:56 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 08:44:56 +0300 |
| commit | c873512ef3a39cc1a605b7a5ff2ad0a33d619aa8 (patch) | |
| tree | 8db2b6a6ef0a08f6e9d78dde00bf44bf60d09d54 /include | |
| parent | 6c9cfb853063f317b2953c5e852b6bac1eb0cade (diff) | |
| parent | 90ca51e8c654699b672ba61aeaa418dfb3252e5e (diff) | |
| download | linux-c873512ef3a39cc1a605b7a5ff2ad0a33d619aa8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.6 net-next PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_arp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 1ed52441972f..10a1e81434cb 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -53,6 +53,10 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev) case ARPHRD_NONE: case ARPHRD_RAWIP: case ARPHRD_PIMREG: + /* PPP adds its l2 header automatically in ppp_start_xmit(). + * This makes it look like an l3 device to __bpf_redirect() and tcf_mirred_init(). + */ + case ARPHRD_PPP: return false; default: return true; |