diff options
| author | Danilo Krummrich <dakr@kernel.org> | 2026-03-23 01:13:06 +0300 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2026-03-23 01:13:33 +0300 |
| commit | 14cf406e083c0541e40cd467ae8336ecceede09e (patch) | |
| tree | eed981730c340cf8b3a3369f9a0b3985e246ee25 /drivers/firewire/net.c | |
| parent | 9aa64d2503c6f5a803ff2990608312e5bdc6b0de (diff) | |
| parent | c369299895a591d96745d6492d4888259b004a9e (diff) | |
| download | linux-14cf406e083c0541e40cd467ae8336ecceede09e.tar.xz | |
Merge tag 'v7.0-rc5' into driver-core-next
We need the driver-core fixes in here as well to build on top of.
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Diffstat (limited to 'drivers/firewire/net.c')
| -rw-r--r-- | drivers/firewire/net.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index f1a2bee39bf1..82b3b6d9ed2d 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -257,9 +257,10 @@ static void fwnet_header_cache_update(struct hh_cache *hh, memcpy((u8 *)hh->hh_data + HH_DATA_OFF(FWNET_HLEN), haddr, net->addr_len); } -static int fwnet_header_parse(const struct sk_buff *skb, unsigned char *haddr) +static int fwnet_header_parse(const struct sk_buff *skb, const struct net_device *dev, + unsigned char *haddr) { - memcpy(haddr, skb->dev->dev_addr, FWNET_ALEN); + memcpy(haddr, dev->dev_addr, FWNET_ALEN); return FWNET_ALEN; } |