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

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

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

Pull networking update from David Miller:

 1) Propagate return error values properly in irda, spider_net, sfc, and
    bfin_mac.  From Wei Yongjun.

 2) Fix fec driver OOPS on rapid link up/down, from Frank Li.

 3) FIX VF resource allocation and chip message payload length errors in
    be2net driver, from Sathya Perla.

 4) Fix inner protocol inspection during GSO from Pravin B Shelar.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  if_cablemodem.h: Add parenthesis around ioctl macros
  gso: Handle Trans-Ether-Bridging protocol in skb_network_protocol()
  net: fec: fix kernel oops when plug/unplug cable many times
  bfin_mac: fix error return code in bfin_mac_probe()
  sfc: fix return value check in efx_ptp_probe_channel()
  net/spider_net: fix error return code in spider_net_open()
  net/irda: fix error return code in bfin_sir_open()
  net: of_mdio: fix behavior on missing phy device
  sierra_net: keep status interrupt URB active
  usbnet: allow status interrupt URB to always be active
  qmi_wwan/cdc_ether: add device IDs for Dell 5804 (Novatel E371) WWAN card
  be2net: disable TX in be_close()
  be2net: fix EQ from getting full while cleaning RX CQ
  be2net: fix payload_len value for GET_MAC_LIST cmd req
  be2net: provision VF resources before enabling SR-IOV
parents e15e6119 4f924b2a

drivers/net/ethernet/adi/bfin_mac.c

+2 −1
Original line number Diff line number Diff line
@@ -1700,7 +1700,8 @@ static int bfin_mac_probe(struct platform_device *pdev) 
	}



	bfin_mac_hwtstamp_init(ndev);

	if (bfin_phc_init(ndev, &pdev->dev)) {

	rc = bfin_phc_init(ndev, &pdev->dev);

	if (rc) {

		dev_err(&pdev->dev, "Cannot register PHC device!\n");

		goto out_err_phc;

	}

drivers/net/ethernet/emulex/benet/be_cmds.c

+2 −3
Original line number Diff line number Diff line
@@ -2640,9 +2640,8 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac, 
	req = get_mac_list_cmd.va;



	be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,

				OPCODE_COMMON_GET_MAC_LIST, sizeof(*req),

				wrb, &get_mac_list_cmd);



			       OPCODE_COMMON_GET_MAC_LIST,

			       get_mac_list_cmd.size, wrb, &get_mac_list_cmd);

	req->hdr.domain = domain;

	req->mac_type = MAC_ADDRESS_TYPE_NETWORK;

	req->perm_override = 1;

drivers/net/ethernet/emulex/benet/be_main.c

+16 −14
Original line number Diff line number Diff line
@@ -1827,7 +1827,7 @@ static void be_rx_cq_clean(struct be_rx_obj *rxo) 
			mdelay(1);

		} else {

			be_rx_compl_discard(rxo, rxcp);

			be_cq_notify(adapter, rx_cq->id, true, 1);

			be_cq_notify(adapter, rx_cq->id, false, 1);

			if (rxcp->num_rcvd == 0)

				break;

		}
@@ -2533,11 +2533,6 @@ static void be_rx_qs_destroy(struct be_adapter *adapter) 
		q = &rxo->q;

		if (q->created) {

			be_cmd_rxq_destroy(adapter, q);

			/* After the rxq is invalidated, wait for a grace time

			 * of 1ms for all dma to end and the flush compl to

			 * arrive

			 */

			mdelay(1);

			be_rx_cq_clean(rxo);

		}

		be_queue_free(adapter, q);
@@ -2564,6 +2559,7 @@ static int be_close(struct net_device *netdev) 
	 * all tx skbs are freed.

	 */

	be_tx_compl_clean(adapter);

	netif_tx_disable(netdev);



	be_rx_qs_destroy(adapter);
@@ -2672,6 +2668,7 @@ static int be_open(struct net_device *netdev) 
	if (!status)

		be_link_status_update(adapter, link_status);



	netif_tx_start_all_queues(netdev);

	be_roce_dev_open(adapter);

	return 0;

err:
@@ -2783,6 +2780,8 @@ static void be_vf_clear(struct be_adapter *adapter) 
		goto done;

	}



	pci_disable_sriov(adapter->pdev);



	for_all_vfs(adapter, vf_cfg, vf) {

		if (lancer_chip(adapter))

			be_cmd_set_mac_list(adapter, NULL, 0, vf + 1);
@@ -2792,7 +2791,6 @@ static void be_vf_clear(struct be_adapter *adapter) 


		be_cmd_if_destroy(adapter, vf_cfg->if_handle, vf + 1);

	}

	pci_disable_sriov(adapter->pdev);

done:

	kfree(adapter->vf_cfg);

	adapter->num_vfs = 0;
@@ -2889,14 +2887,9 @@ static int be_vf_setup(struct be_adapter *adapter) 
			dev_info(dev, "Device supports %d VFs and not %d\n",

				 adapter->dev_num_vfs, num_vfs);

		adapter->num_vfs = min_t(u16, num_vfs, adapter->dev_num_vfs);



		status = pci_enable_sriov(adapter->pdev, num_vfs);

		if (status) {

			dev_err(dev, "SRIOV enable failed\n");

			adapter->num_vfs = 0;

		if (!adapter->num_vfs)

			return 0;

	}

	}



	status = be_vf_setup_init(adapter);

	if (status)
@@ -2944,6 +2937,15 @@ static int be_vf_setup(struct be_adapter *adapter) 


		be_cmd_enable_vf(adapter, vf + 1);

	}



	if (!old_vfs) {

		status = pci_enable_sriov(adapter->pdev, adapter->num_vfs);

		if (status) {

			dev_err(dev, "SRIOV enable failed\n");

			adapter->num_vfs = 0;

			goto err;

		}

	}

	return 0;

err:

	dev_err(dev, "VF setup failed\n");
@@ -3198,7 +3200,7 @@ static int be_setup(struct be_adapter *adapter) 
		be_cmd_set_flow_control(adapter, adapter->tx_fc,

					adapter->rx_fc);



	if (be_physfn(adapter) && num_vfs) {

	if (be_physfn(adapter)) {

		if (adapter->dev_num_vfs)

			be_vf_setup(adapter);

		else

drivers/net/ethernet/freescale/fec.h

+6 −4
Original line number Diff line number Diff line
@@ -198,6 +198,11 @@ struct bufdesc_ex { 
#define FLAG_RX_CSUM_ENABLED	(BD_ENET_RX_ICE | BD_ENET_RX_PCR)

#define FLAG_RX_CSUM_ERROR	(BD_ENET_RX_ICE | BD_ENET_RX_PCR)



struct fec_enet_delayed_work {

	struct delayed_work delay_work;

	bool timeout;

};



/* The FEC buffer descriptors track the ring buffers.  The rx_bd_base and

 * tx_bd_base always point to the base of the buffer descriptors.  The

 * cur_rx and cur_tx point to the currently available buffer.
@@ -232,9 +237,6 @@ struct fec_enet_private { 
	/* The ring entries to be free()ed */

	struct bufdesc	*dirty_tx;



	/* hold while accessing the HW like ringbuffer for tx/rx but not MAC */

	spinlock_t hw_lock;



	struct	platform_device *pdev;



	int	opened;
@@ -269,7 +271,7 @@ struct fec_enet_private { 
	int hwts_rx_en;

	int hwts_tx_en;

	struct timer_list time_keep;



	struct fec_enet_delayed_work delay_work;

};



void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev);

drivers/net/ethernet/freescale/fec_main.c

+33 −11
Original line number Diff line number Diff line
@@ -445,6 +445,13 @@ fec_restart(struct net_device *ndev, int duplex) 
	u32 rcntl = OPT_FRAME_SIZE | 0x04;

	u32 ecntl = 0x2; /* ETHEREN */



	if (netif_running(ndev)) {

		netif_device_detach(ndev);

		napi_disable(&fep->napi);

		netif_stop_queue(ndev);

		netif_tx_lock(ndev);

	}



	/* Whack a reset.  We should wait for this. */

	writel(1, fep->hwp + FEC_ECNTRL);

	udelay(10);
@@ -605,6 +612,13 @@ fec_restart(struct net_device *ndev, int duplex) 


	/* Enable interrupts we wish to service */

	writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);



	if (netif_running(ndev)) {

		netif_device_attach(ndev);

		napi_enable(&fep->napi);

		netif_wake_queue(ndev);

		netif_tx_unlock(ndev);

	}

}



static void
@@ -644,8 +658,22 @@ fec_timeout(struct net_device *ndev) 


	ndev->stats.tx_errors++;



	fec_restart(ndev, fep->full_duplex);

	netif_wake_queue(ndev);

	fep->delay_work.timeout = true;

	schedule_delayed_work(&(fep->delay_work.delay_work), 0);

}



static void fec_enet_work(struct work_struct *work)

{

	struct fec_enet_private *fep =

		container_of(work,

			     struct fec_enet_private,

			     delay_work.delay_work.work);



	if (fep->delay_work.timeout) {

		fep->delay_work.timeout = false;

		fec_restart(fep->netdev, fep->full_duplex);

		netif_wake_queue(fep->netdev);

	}

}



static void
@@ -1024,16 +1052,12 @@ static void fec_enet_adjust_link(struct net_device *ndev) 
{

	struct fec_enet_private *fep = netdev_priv(ndev);

	struct phy_device *phy_dev = fep->phy_dev;

	unsigned long flags;



	int status_change = 0;



	spin_lock_irqsave(&fep->hw_lock, flags);



	/* Prevent a state halted on mii error */

	if (fep->mii_timeout && phy_dev->state == PHY_HALTED) {

		phy_dev->state = PHY_RESUMING;

		goto spin_unlock;

		return;

	}



	if (phy_dev->link) {
@@ -1061,9 +1085,6 @@ static void fec_enet_adjust_link(struct net_device *ndev) 
		}

	}



spin_unlock:

	spin_unlock_irqrestore(&fep->hw_lock, flags);



	if (status_change)

		phy_print_status(phy_dev);

}
@@ -1732,7 +1753,6 @@ static int fec_enet_init(struct net_device *ndev) 
		return -ENOMEM;



	memset(cbd_base, 0, PAGE_SIZE);

	spin_lock_init(&fep->hw_lock);



	fep->netdev = ndev;
@@ -1952,6 +1972,7 @@ fec_probe(struct platform_device *pdev) 
	if (fep->bufdesc_ex && fep->ptp_clock)

		netdev_info(ndev, "registered PHC device %d\n", fep->dev_id);



	INIT_DELAYED_WORK(&(fep->delay_work.delay_work), fec_enet_work);

	return 0;



failed_register:
@@ -1984,6 +2005,7 @@ fec_drv_remove(struct platform_device *pdev) 
	struct fec_enet_private *fep = netdev_priv(ndev);

	int i;



	cancel_delayed_work_sync(&(fep->delay_work.delay_work));

	unregister_netdev(ndev);

	fec_enet_mii_remove(fep);

	del_timer_sync(&fep->time_keep);