diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-03-23 11:59:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-03-23 11:59:16 +0300 |
| commit | 6872c84dc6f5d18e02ebc34b257f4152895e236c (patch) | |
| tree | 10d75124b78b4ad2a244c9853a7712dde2315d4b /include/linux/etherdevice.h | |
| parent | eb3b0d92c9c39890592cca6647601fe5c631efea (diff) | |
| parent | c369299895a591d96745d6492d4888259b004a9e (diff) | |
| download | linux-6872c84dc6f5d18e02ebc34b257f4152895e236c.tar.xz | |
Merge 7.0-rc5 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 3 |
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, |