diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-03-23 05:31:37 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-03-23 05:33:29 +0300 |
| commit | bfec8e88ff6022b056615ec71506703e7e54de82 (patch) | |
| tree | eaf7952a4f8d056974678d2070ed1f92741dfd15 /include/linux/if_ether.h | |
| parent | 61bc8460815956d57f3f7785e9adcdf8f1e62413 (diff) | |
| parent | c369299895a591d96745d6492d4888259b004a9e (diff) | |
| download | linux-bfec8e88ff6022b056615ec71506703e7e54de82.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.0-rc5
Cross-merge BPF and other fixes after downstream PR.
Minor conflicts in:
tools/testing/selftests/bpf/progs/exceptions_fail.c
tools/testing/selftests/bpf/progs/verifier_bounds.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/if_ether.h')
| -rw-r--r-- | include/linux/if_ether.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 61b7335aa037..ca9afa824aa4 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -40,7 +40,8 @@ static inline struct ethhdr *inner_eth_hdr(const struct sk_buff *skb) return (struct ethhdr *)skb_inner_mac_header(skb); } -int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr); +int eth_header_parse(const struct sk_buff *skb, const struct net_device *dev, + unsigned char *haddr); extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); |