Commit 52926229 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 

Pull firewire updates from Stefan Richter:

 - Migrate the bus snooper driver 'nosy' from PCI to DMA API

 - Small janitorial cleanup in the IPv4/v6-over-1394 driver

[ The 'nosy' change already come in as a different commit through Greg
  KH in the misc tree back in the previous merge window, so only the
  cleanup ends up being new to 5.15   - Linus ]

* tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: nosy: switch from 'pci_' to 'dma_' API
  firewire: net: remove unused variable 'guid'
parents 6701e7e7 54b3bd99

drivers/firewire/net.c

+0 −4
Original line number Diff line number Diff line
@@ -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) {