diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-21 10:56:11 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-21 10:56:11 +1000 |
| commit | 50b1956da3d0bd25e275aa0614d51553754bdb04 (patch) | |
| tree | c1039cf93de23e239ce1b5e278a8b69f88692578 | |
| parent | 88d47719f9e1215e6cb58bfaecbc5f5f56176f1b (diff) | |
| parent | 67f8e65e4fc19e24993e8780f41279eeffbd0610 (diff) | |
| download | linux-next-50b1956da3d0bd25e275aa0614d51553754bdb04.tar.gz | |
Merge remote-tracking branch 'ieee1394/for-next'
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
| -rw-r--r-- | drivers/firewire/net.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 715e491dfbc33..28785642a5c55 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -490,7 +490,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net, { struct fwnet_device *dev; int status; - __be64 guid; switch (ether_type) { case ETH_P_ARP: @@ -512,7 +511,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net, * Parse the encapsulation header. This actually does the job of * converting to an ethernet-like pseudo frame header. */ - guid = cpu_to_be64(dev->card->guid); if (dev_hard_header(skb, net, ether_type, is_broadcast ? net->broadcast : net->dev_addr, NULL, skb->len) >= 0) { |