Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull networking fixes from David Miller:

 1) Limit the number of can filters to avoid > MAX_ORDER allocations.
    Fix from Marc Kleine-Budde.

 2) Limit GSO max size in netvsc driver to avoid problems with NVGRE
    configurations. From Stephen Hemminger.

 3) Return proper error when memory allocation fails in
    ser_gigaset_init(), from Dan Carpenter.

 4) Missing linkage undo in error paths of ipvlan_link_new(), from Gao
    Feng.

 5) Missing necessayr SET_NETDEV_DEV in lantiq and cpmac drivers, from
    Florian Fainelli.

 6) Handle probe deferral properly in smsc911x driver.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: mlx5: Fix Kconfig help text
  net: smsc911x: back out silently on probe deferrals
  ibmveth: set correct gso_size and gso_type
  net: ethernet: cpmac: Call SET_NETDEV_DEV()
  net: ethernet: lantiq_etop: Call SET_NETDEV_DEV()
  vhost-vsock: fix orphan connection reset
  cxgb4/cxgb4vf: Assign netdev->dev_port with port ID
  driver: ipvlan: Unlink the upper dev when ipvlan_link_new failed
  ser_gigaset: return -ENOMEM on error instead of success
  NET: usb: cdc_mbim: add quirk for supporting Telit LE922A
  can: peak: fix bad memory access and free sequence
  phy: Don't increment MDIO bus refcount unless it's a different owner
  netvsc: reduce maximum GSO size
  drivers: net: cpsw-phy-sel: Clear RGMII_IDMODE on "rgmii" links
  can: raw: raw_setsockopt: limit number of can_filter that can be set
parents 810ac7b7 d33695fb

drivers/isdn/gigaset/ser-gigaset.c

+3 −1
Original line number Diff line number Diff line
@@ -755,8 +755,10 @@ static int __init ser_gigaset_init(void) 
	driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,

				    GIGASET_MODULENAME, GIGASET_DEVNAME,

				    &ops, THIS_MODULE);

	if (!driver)

	if (!driver) {

		rc = -ENOMEM;

		goto error;

	}



	rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc);

	if (rc != 0) {

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+4 −2
Original line number Diff line number Diff line
@@ -870,23 +870,25 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter, 
static void peak_usb_disconnect(struct usb_interface *intf)

{

	struct peak_usb_device *dev;

	struct peak_usb_device *dev_prev_siblings;



	/* unregister as many netdev devices as siblings */

	for (dev = usb_get_intfdata(intf); dev; dev = dev->prev_siblings) {

	for (dev = usb_get_intfdata(intf); dev; dev = dev_prev_siblings) {

		struct net_device *netdev = dev->netdev;

		char name[IFNAMSIZ];



		dev_prev_siblings = dev->prev_siblings;

		dev->state &= ~PCAN_USB_STATE_CONNECTED;

		strncpy(name, netdev->name, IFNAMSIZ);



		unregister_netdev(netdev);

		free_candev(netdev);



		kfree(dev->cmd_buf);

		dev->next_siblings = NULL;

		if (dev->adapter->dev_free)

			dev->adapter->dev_free(dev);



		free_candev(netdev);

		dev_info(&intf->dev, "%s removed\n", name);

	}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −0
Original line number Diff line number Diff line
@@ -4931,6 +4931,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 */

	for_each_port(adapter, i) {

		pi = adap2pinfo(adapter, i);

		adapter->port[i]->dev_port = pi->lport;

		netif_set_real_num_tx_queues(adapter->port[i], pi->nqsets);

		netif_set_real_num_rx_queues(adapter->port[i], pi->nqsets);

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+0 −1
Original line number Diff line number Diff line
@@ -7851,7 +7851,6 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf) 
			return ret;



		memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);

		adap->port[i]->dev_port = j;

		j++;

	}

	return 0;

drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c

+1 −0
Original line number Diff line number Diff line
@@ -2969,6 +2969,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev, 


		netdev->netdev_ops = &cxgb4vf_netdev_ops;

		netdev->ethtool_ops = &cxgb4vf_ethtool_ops;

		netdev->dev_port = pi->port_id;



		/*

		 * Initialize the hardware/software state for the port.