Merge tag 'perf-tools-for-v5.15-2021-09-11' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / firewire / net.c

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 715e491..4c3fd2e 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -488,9 +488,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                                        struct sk_buff *skb, u16 source_node_id,
                                        bool is_broadcast, u16 ether_type)
 {
-       struct fwnet_device *dev;
        int status;
-       __be64 guid;
 
        switch (ether_type) {
        case ETH_P_ARP:
@@ -503,7 +501,6 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                goto err;
        }
 
-       dev = netdev_priv(net);
        /* Write metadata, and then pass to the receive level */
        skb->dev = net;
        skb->ip_summed = CHECKSUM_NONE;
@@ -512,7 +509,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) {