summaryrefslogtreecommitdiff
path: root/include/linux/etherdevice.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2026-03-27 12:16:52 +0300
committerTakashi Iwai <tiwai@suse.de>2026-03-27 12:16:52 +0300
commit50c8f83c41123cab79575e8d73040a37da4612c5 (patch)
treec824f90d21d57e668979cad4efb4c59d0003d6b7 /include/linux/etherdevice.h
parent591721223be9e28f83489a59289579493b8e3d83 (diff)
parentd40a198e2b7821197c5c77b89d0130cc90f400f5 (diff)
downloadlinux-50c8f83c41123cab79575e8d73040a37da4612c5.tar.xz
Merge tag 'asoc-fix-v7.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v7.0 This is two week's worth of fixes and quirks so it's a bit larger than you might expect, there's nothing too exciting individually and nothing in core code.
Diffstat (limited to 'include/linux/etherdevice.h')
-rw-r--r--include/linux/etherdevice.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 9a1eacf35d37..df8f88f63a70 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -42,7 +42,8 @@ extern const struct header_ops eth_header_ops;
int eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
const void *daddr, const void *saddr, unsigned len);
-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);
int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh,
__be16 type);
void eth_header_cache_update(struct hh_cache *hh, const struct net_device *dev,