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

Commit 26b552e0 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) Workaround hw bug when acquiring PCI bos ownership of iwlwifi
    devices, from Emmanuel Grumbach.

 2) Falling back to vmalloc in conntrack should not emit a warning, from
    Pablo Neira Ayuso.

 3) Fix NULL deref when rtlwifi driver is used as an AP, from Luis
    Felipe Dominguez Vega.

 4) Rocker doesn't free netdev on device removal, from Ido Schimmel.

 5) UDP multicast early sock demux has route handling races, from Eric
    Dumazet.

 6) Fix L4 checksum handling in openvswitch, from Glenn Griffin.

 7) Fix use-after-free in skb_set_peeked, from Herbert Xu.

 8) Don't advertize NETIF_F_FRAGLIST in virtio_net driver, this can lead
    to fraglists longer than the driver can support.  From Jason Wang.

 9) Fix mlx5 on non-4k-pagesize systems, from Carol L Soto.

10) Fix interrupt storm in bna driver, from Ivan Vecera.

11) Don't propagate -EBUSY from netlink_insert(), from Daniel Borkmann.

12) Fix inet request sock leak, from Eric Dumazet.

13) Fix TX interrupt masking and marking in TX descriptors of fs_enet
    driver, from LEROY Christophe.

14) Get rid of rule optimizer in gianfar driver, it's buggy and unlikely
    to get fixed any time soon.  From Jakub Kicinski

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
  cosa: missing error code on failure in probe()
  gianfar: remove faulty filer optimizer
  gianfar: correct list membership accounting
  gianfar: correct filer table writing
  bonding: Gratuitous ARP gets dropped when first slave added
  net: dsa: Do not override PHY interface if already configured
  net: fs_enet: mask interrupts for TX partial frames.
  net: fs_enet: explicitly remove I flag on TX partial frames
  inet: fix possible request socket leak
  inet: fix races with reqsk timers
  mkiss: Fix error handling in mkiss_open()
  bnx2x: Free NVRAM lock at end of each page
  bnx2x: Prevent null pointer dereference on SKB release
  cxgb4: missing curly braces in t4_setup_debugfs()
  net-timestamp: Update skb_complete_tx_timestamp comment
  ipv6: don't reject link-local nexthop on other interface
  netlink: make sure -EBUSY won't escape from netlink_insert
  bna: fix interrupts storm caused by erroneous packets
  net: mvpp2: replace TX coalescing interrupts with hrtimer
  net: mvpp2: enable proper per-CPU TX buffers unmapping
  ...
parents 2331d30d e6d00693

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -786,6 +786,7 @@ static bool bond_should_notify_peers(struct bonding *bond) 
		   slave ? slave->dev->name : "NULL");



	if (!slave || !bond->send_peer_notif ||

	    !netif_carrier_ok(bond->dev) ||

	    test_bit(__LINK_STATE_LINKWATCH_PENDING, &slave->dev->state))

		return false;

drivers/net/ethernet/3com/3c59x.c

+8 −9
Original line number Diff line number Diff line
@@ -1763,16 +1763,9 @@ vortex_open(struct net_device *dev) 
			vp->rx_ring[i].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data, PKT_BUF_SZ, PCI_DMA_FROMDEVICE));

		}

		if (i != RX_RING_SIZE) {

			int j;

			pr_emerg("%s: no memory for rx ring\n", dev->name);

			for (j = 0; j < i; j++) {

				if (vp->rx_skbuff[j]) {

					dev_kfree_skb(vp->rx_skbuff[j]);

					vp->rx_skbuff[j] = NULL;

				}

			}

			retval = -ENOMEM;

			goto err_free_irq;

			goto err_free_skb;

		}

		/* Wrap the ring. */

		vp->rx_ring[i-1].next = cpu_to_le32(vp->rx_ring_dma);
@@ -1782,7 +1775,13 @@ vortex_open(struct net_device *dev) 
	if (!retval)

		goto out;



err_free_irq:

err_free_skb:

	for (i = 0; i < RX_RING_SIZE; i++) {

		if (vp->rx_skbuff[i]) {

			dev_kfree_skb(vp->rx_skbuff[i]);

			vp->rx_skbuff[i] = NULL;

		}

	}

	free_irq(dev->irq, dev);

err:

	if (vortex_debug > 1)

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -262,9 +262,9 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata, 
	if (likely(skb)) {

		(*pkts_compl)++;

		(*bytes_compl) += skb->len;

		dev_kfree_skb_any(skb);

	}



	dev_kfree_skb_any(skb);

	tx_buf->first_bd = 0;

	tx_buf->skb = NULL;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+16 −0
Original line number Diff line number Diff line
@@ -1718,6 +1718,22 @@ static int bnx2x_nvram_write(struct bnx2x *bp, u32 offset, u8 *data_buf, 
		offset += sizeof(u32);

		data_buf += sizeof(u32);

		written_so_far += sizeof(u32);



		/* At end of each 4Kb page, release nvram lock to allow MFW

		 * chance to take it for its own use.

		 */

		if ((cmd_flags & MCPR_NVM_COMMAND_LAST) &&

		    (written_so_far < buf_size)) {

			DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,

			   "Releasing NVM lock after offset 0x%x\n",

			   (u32)(offset - sizeof(u32)));

			bnx2x_release_nvram_lock(bp);

			usleep_range(1000, 2000);

			rc = bnx2x_acquire_nvram_lock(bp);

			if (rc)

				return rc;

		}



		cmd_flags = 0;

	}

drivers/net/ethernet/brocade/bna/bnad.c

+1 −1
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget) 
			if (!next_cmpl->valid)

				break;

		}

		packets++;



		/* TODO: BNA_CQ_EF_LOCAL ? */

		if (unlikely(flags & (BNA_CQ_EF_MAC_ERROR |
@@ -692,7 +693,6 @@ bnad_cq_process(struct bnad *bnad, struct bna_ccb *ccb, int budget) 
		else

			bnad_cq_setup_skb_frags(rcb, skb, sop_ci, nvecs, len);



		packets++;

		rcb->rxq->rx_packets++;

		rcb->rxq->rx_bytes += totlen;

		ccb->bytes_per_intr += totlen;