mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

FireWire (IEEE 1394) subsystem updates: 

- Migrate the bus snooper driver 'nosy' from PCI to DMA API.
 
   - Small janitorial cleanup in the IPv4/v6-over-1394 driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEElVwAmOXEbvmhUkgUefNvslRdedAFAmE8lY4aHHN0ZWZhbnJA
 czVyNi5pbi1iZXJsaW4uZGUACgkQefNvslRdedBvwQ//eZ/raUK0z49DxIQ+xyFc
 NfPhyv0UA4qSiQE7dZBLheDPCkM4UCoV3vrgnpgcF0BswHlMEaLE7gZqeshRLB02
 /D5qP3Qe21Key+QlQJb91/1gNttDz3C3CW52urCaIoRhkuFa0ISB398X24Sl2+CF
 v4I4LkbmnE4MjUKSz6aKexZmeyGT9OBWmRtbCcHF3MR06L65SopGAruh/Jt7teWJ
 hXS5Ew2UEsS0XqxnD/6xSSJRTgB863sPksRU85GUNNKyB2gM3eksuGP3HkA3b0Cz
 W5V9XV/aK6AIQxQr9lk0rLk0SABdaRDfM6cYkypinpsna7PDmICESnbaL386kC1F
 /luzIvwbX4bMAx8vE8V+J2PeLiqZMPfEdpMhiBv0yy0YSYVvthtCJPzXImp8M5/w
 6wyPXM2CkuEdKjX/XrS6Nz8YyVFUPkj9yY4ESb/FY9Sayi1tanAoiXQ8xPfbwhg0
 XkIW4zsQ/S76Waks6ATl/Vdoh3XKmcZDJuIjUPMnLfhEo4CmwEo/iuqvtchhIThN
 Z4Ps6z9JRLzNKpElaBjMxtg4tl5bvwmXT+VcpD2QkYWgoytwRsoMa+NKQK0R5vVV
 aCbjpOjV9Q/ltygbLpOdeBjyN19cgI2O494jqhqgN0Zyex7DkofLOEbNLd5517Po
 49vQiFcAvMX2a6CX42KmeOU=
 =ZWgf
 -----END PGP SIGNATURE-----

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'
This commit is contained in:
Linus Torvalds 2021-09-11 09:47:33 -07:00
parent 6701e7e7d8 54b3bd99f0
commit 52926229be
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firewire/net.c
View File

@ -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) {