Commit b6df0078 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Trivial conflict in net/netfilter/nf_tables_api.c.

Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.

skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3f8ad50a a118ff66

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12675,6 +12675,7 @@ W: http://www.netfilter.org/ 
W:	http://www.iptables.org/

W:	http://www.nftables.org/

Q:	http://patchwork.ozlabs.org/project/netfilter-devel/list/

C:	irc://irc.libera.chat/netfilter

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git

F:	include/linux/netfilter*

drivers/atm/nicstar.c

+13 −11
Original line number Diff line number Diff line
@@ -527,6 +527,15 @@ static int ns_init_card(int i, struct pci_dev *pcidev) 
	/* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */

	writel(0x00000000, card->membase + VPM);



	card->intcnt = 0;

	if (request_irq

	    (pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) {

		pr_err("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);

		error = 9;

		ns_init_card_error(card, error);

		return error;

	}



	/* Initialize TSQ */

	card->tsq.org = dma_alloc_coherent(&card->pcidev->dev,

					   NS_TSQSIZE + NS_TSQ_ALIGNMENT,
@@ -753,15 +762,6 @@ static int ns_init_card(int i, struct pci_dev *pcidev) 


	card->efbie = 1;



	card->intcnt = 0;

	if (request_irq

	    (pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) {

		printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);

		error = 9;

		ns_init_card_error(card, error);

		return error;

	}



	/* Register device */

	card->atmdev = atm_dev_register("nicstar", &card->pcidev->dev, &atm_ops,

					-1, NULL);
@@ -839,10 +839,12 @@ static void ns_init_card_error(ns_dev *card, int error) 
			dev_kfree_skb_any(hb);

	}

	if (error >= 12) {

		kfree(card->rsq.org);

		dma_free_coherent(&card->pcidev->dev, NS_RSQSIZE + NS_RSQ_ALIGNMENT,

				card->rsq.org, card->rsq.dma);

	}

	if (error >= 11) {

		kfree(card->tsq.org);

		dma_free_coherent(&card->pcidev->dev, NS_TSQSIZE + NS_TSQ_ALIGNMENT,

				card->tsq.org, card->tsq.dma);

	}

	if (error >= 10) {

		free_irq(card->pcidev->irq, card);

drivers/net/bonding/bond_main.c

+8 −0
Original line number Diff line number Diff line
@@ -1600,6 +1600,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
	int link_reporting;

	int res = 0, i;



	if (slave_dev->flags & IFF_MASTER &&

	    !netif_is_bond_master(slave_dev)) {

		NL_SET_ERR_MSG(extack, "Device with IFF_MASTER cannot be enslaved");

		netdev_err(bond_dev,

			   "Error: Device with IFF_MASTER cannot be enslaved\n");

		return -EPERM;

	}



	if (!bond->params.use_carrier &&

	    slave_dev->ethtool_ops->get_link == NULL &&

	    slave_ops->ndo_do_ioctl == NULL) {

drivers/net/can/peak_canfd/peak_canfd.c

+2 −2
Original line number Diff line number Diff line
@@ -351,8 +351,8 @@ static int pucan_handle_status(struct peak_canfd_priv *priv, 
				return err;

		}



		/* start network queue (echo_skb array is empty) */

		netif_start_queue(ndev);

		/* wake network queue up (echo_skb array is empty) */

		netif_wake_queue(ndev);



		return 0;

	}

drivers/net/can/usb/ems_usb.c

+2 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,6 @@ static void ems_usb_disconnect(struct usb_interface *intf) 


	if (dev) {

		unregister_netdev(dev->netdev);

		free_candev(dev->netdev);



		unlink_all_urbs(dev);
@@ -1061,6 +1060,8 @@ static void ems_usb_disconnect(struct usb_interface *intf) 


		kfree(dev->intr_in_buffer);

		kfree(dev->tx_msg_buffer);



		free_candev(dev->netdev);

	}

}