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

Commit 4b19a9e2 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) Handle multicast packets properly in fast-RX path of mac80211, from
    Johannes Berg.

 2) Because of a logic bug, the user can't actually force SW
    checksumming on r8152 devices. This makes diagnosis of hw
    checksumming bugs really annoying. Fix from Hayes Wang.

 3) VXLAN route lookup does not take the source and destination ports
    into account, which means IPSEC policies cannot be matched properly.
    Fix from Martynas Pumputis.

 4) Do proper RCU locking in netvsc callbacks, from Stephen Hemminger.

 5) Fix SKB leaks in mlxsw driver, from Arkadi Sharshevsky.

 6) If lwtunnel_fill_encap() fails, we do not abort the netlink message
    construction properly in fib_dump_info(), from David Ahern.

 7) Do not use kernel stack for DMA buffers in atusb driver, from Stefan
    Schmidt.

 8) Openvswitch conntack actions need to maintain a correct checksum,
    fix from Lance Richardson.

 9) ax25_disconnect() is missing a check for ax25->sk being NULL, in
    fact it already checks this, but not in all of the necessary spots.
    Fix from Basil Gunn.

10) Action GET operations in the packet scheduler can erroneously bump
    the reference count of the entry, making it unreleasable. Fix from
    Jamal Hadi Salim. Jamal gives a great set of example command lines
    that trigger this in the commit message.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
  net sched actions: fix refcnt when GETing of action after bind
  net/mlx4_core: Eliminate warning messages for SRQ_LIMIT under SRIOV
  net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions
  net/mlx4_core: Fix racy CQ (Completion Queue) free
  net: stmmac: don't use netdev_[dbg, info, ..] before net_device is registered
  net/mlx5e: Fix a -Wmaybe-uninitialized warning
  ax25: Fix segfault after sock connection timeout
  bpf: rework prog_digest into prog_tag
  tipc: allocate user memory with GFP_KERNEL flag
  net: phy: dp83867: allow RGMII_TXID/RGMII_RXID interface types
  ip6_tunnel: Account for tunnel header in tunnel MTU
  mld: do not remove mld souce list info when set link down
  be2net: fix MAC addr setting on privileged BE3 VFs
  be2net: don't delete MAC on close on unprivileged BE3 VFs
  be2net: fix status check in be_cmd_pmac_add()
  cpmac: remove hopeless #warning
  ravb: do not use zero-length alignment DMA descriptor
  mlx4: do not call napi_schedule() without care
  openvswitch: maintain correct checksum state in conntrack actions
  tcp: fix tcp_fastopen unaligned access complaints on sparc
  ...
parents 203f80f1 0faa9cb5

Documentation/devicetree/bindings/net/ti,dp83867.txt

+4 −2
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
Required properties:

	- reg - The ID number for the phy, usually a small integer

	- ti,rx-internal-delay - RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID

	- ti,tx-internal-delay - RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID

	- ti,fifo-depth - Transmitt FIFO depth- see dt-bindings/net/ti-dp83867.h

		for applicable values

drivers/net/ethernet/broadcom/bcmsysport.c

+18 −7
Original line number Diff line number Diff line
@@ -710,11 +710,8 @@ static unsigned int __bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv, 
	unsigned int c_index, last_c_index, last_tx_cn, num_tx_cbs;

	unsigned int pkts_compl = 0, bytes_compl = 0;

	struct bcm_sysport_cb *cb;

	struct netdev_queue *txq;

	u32 hw_ind;



	txq = netdev_get_tx_queue(ndev, ring->index);



	/* Compute how many descriptors have been processed since last call */

	hw_ind = tdma_readl(priv, TDMA_DESC_RING_PROD_CONS_INDEX(ring->index));

	c_index = (hw_ind >> RING_CONS_INDEX_SHIFT) & RING_CONS_INDEX_MASK;
@@ -745,9 +742,6 @@ static unsigned int __bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv, 


	ring->c_index = c_index;



	if (netif_tx_queue_stopped(txq) && pkts_compl)

		netif_tx_wake_queue(txq);



	netif_dbg(priv, tx_done, ndev,

		  "ring=%d c_index=%d pkts_compl=%d, bytes_compl=%d\n",

		  ring->index, ring->c_index, pkts_compl, bytes_compl);
@@ -759,16 +753,33 @@ static unsigned int __bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv, 
static unsigned int bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv,

					   struct bcm_sysport_tx_ring *ring)

{

	struct netdev_queue *txq;

	unsigned int released;

	unsigned long flags;



	txq = netdev_get_tx_queue(priv->netdev, ring->index);



	spin_lock_irqsave(&ring->lock, flags);

	released = __bcm_sysport_tx_reclaim(priv, ring);

	if (released)

		netif_tx_wake_queue(txq);



	spin_unlock_irqrestore(&ring->lock, flags);



	return released;

}



/* Locked version of the per-ring TX reclaim, but does not wake the queue */

static void bcm_sysport_tx_clean(struct bcm_sysport_priv *priv,

				 struct bcm_sysport_tx_ring *ring)

{

	unsigned long flags;



	spin_lock_irqsave(&ring->lock, flags);

	__bcm_sysport_tx_reclaim(priv, ring);

	spin_unlock_irqrestore(&ring->lock, flags);

}



static int bcm_sysport_tx_poll(struct napi_struct *napi, int budget)

{

	struct bcm_sysport_tx_ring *ring =
@@ -1252,7 +1263,7 @@ static void bcm_sysport_fini_tx_ring(struct bcm_sysport_priv *priv, 
	napi_disable(&ring->napi);

	netif_napi_del(&ring->napi);



	bcm_sysport_tx_reclaim(priv, ring);

	bcm_sysport_tx_clean(priv, ring);



	kfree(ring->cbs);

	ring->cbs = NULL;

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+6 −5
Original line number Diff line number Diff line
@@ -47,8 +47,9 @@ struct lmac { 
struct bgx {

	u8			bgx_id;

	struct	lmac		lmac[MAX_LMAC_PER_BGX];

	int			lmac_count;

	u8			lmac_count;

	u8			max_lmac;

	u8                      acpi_lmac_idx;

	void __iomem		*reg_base;

	struct pci_dev		*pdev;

	bool                    is_dlm;
@@ -1143,13 +1144,13 @@ static acpi_status bgx_acpi_register_phy(acpi_handle handle, 
	if (acpi_bus_get_device(handle, &adev))

		goto out;



	acpi_get_mac_address(dev, adev, bgx->lmac[bgx->lmac_count].mac);

	acpi_get_mac_address(dev, adev, bgx->lmac[bgx->acpi_lmac_idx].mac);



	SET_NETDEV_DEV(&bgx->lmac[bgx->lmac_count].netdev, dev);

	SET_NETDEV_DEV(&bgx->lmac[bgx->acpi_lmac_idx].netdev, dev);



	bgx->lmac[bgx->lmac_count].lmacid = bgx->lmac_count;

	bgx->lmac[bgx->acpi_lmac_idx].lmacid = bgx->acpi_lmac_idx;

	bgx->acpi_lmac_idx++; /* move to next LMAC */

out:

	bgx->lmac_count++;

	return AE_OK;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr, 
err:

	mutex_unlock(&adapter->mcc_lock);



	 if (status == MCC_STATUS_UNAUTHORIZED_REQUEST)

	 if (base_status(status) == MCC_STATUS_UNAUTHORIZED_REQUEST)

		status = -EPERM;



	return status;

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

+15 −3
Original line number Diff line number Diff line
@@ -318,6 +318,13 @@ static int be_mac_addr_set(struct net_device *netdev, void *p) 
	if (ether_addr_equal(addr->sa_data, adapter->dev_mac))

		return 0;



	/* BE3 VFs without FILTMGMT privilege are not allowed to set its MAC

	 * address

	 */

	if (BEx_chip(adapter) && be_virtfn(adapter) &&

	    !check_privilege(adapter, BE_PRIV_FILTMGMT))

		return -EPERM;



	/* if device is not running, copy MAC to netdev->dev_addr */

	if (!netif_running(netdev))

		goto done;
@@ -3609,7 +3616,11 @@ static void be_rx_qs_destroy(struct be_adapter *adapter) 


static void be_disable_if_filters(struct be_adapter *adapter)

{

	/* Don't delete MAC on BE3 VFs without FILTMGMT privilege  */

	if (!BEx_chip(adapter) || !be_virtfn(adapter) ||

	    check_privilege(adapter, BE_PRIV_FILTMGMT))

		be_dev_mac_del(adapter, adapter->pmac_id[0]);



	be_clear_uc_list(adapter);

	be_clear_mc_list(adapter);
@@ -3762,8 +3773,9 @@ static int be_enable_if_filters(struct be_adapter *adapter) 
	if (status)

		return status;



	/* For BE3 VFs, the PF programs the initial MAC address */

	if (!(BEx_chip(adapter) && be_virtfn(adapter))) {

	/* Don't add MAC on BE3 VFs without FILTMGMT privilege */

	if (!BEx_chip(adapter) || !be_virtfn(adapter) ||

	    check_privilege(adapter, BE_PRIV_FILTMGMT)) {

		status = be_dev_mac_add(adapter, adapter->netdev->dev_addr);

		if (status)

			return status;