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

Commit 323a72d8 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:
 "This is primarily to get those r8169 reverts sorted, but other fixes
  have accumulated meanwhile.

   1) Revert two r8169 changes to fix suspend/resume for some users,
      from Francois Romieu.

   2) PCI dma mapping errors in atl1c are not checked for and this cause
      hard crashes for some users, from Xiong Huang.

   3) In 3.8.x we merged the removal of the EXPERIMENTAL dependency for
      'dlm' but the same patch for 'sctp' got lost somewhere, resulting
      in the potential for build errors since there are cross
      dependencies.  From Kees Cook.

   4) SCTP's ipv6 socket route validation makes boolean tests
      incorrectly, fix from Daniel Borkmann.

   5) mac80211 does sizeof(ptr) instead of (sizeof(ptr) * nelem), from
      Cong Ding.

   6) arp_rcv() can crash on shared non-linear packets, from Eric
      Dumazet.

   7) Avoid crashes in macvtap by setting ->gso_type consistently in
      ixgbe, qlcnic, and bnx2x drivers.  From Michael S Tsirkin and
      Alexander Duyck.

   8) Trinity fuzzer spots infinite loop in __skb_recv_datagram(), fix
      from Eric Dumazet.

   9) STP protocol frames should use high packet priority, otherwise an
      overloaded bridge can get stuck.  From Stephen Hemminger.

  10) The HTB packet scheduler was converted some time ago to store
      internal timestamps in nanoseconds, but we don't convert back into
      psched ticks for the user during dumps.  Fix from Jiri Pirko.

  11) mwl8k channel table doesn't set the .band field properly,
      resulting in NULL pointer derefs.  Fix from Jonas Gorski.

  12) mac80211 doesn't accumulate channels properly during a scan so we
      can downgrade heavily to a much less desirable connection speed.
      Fix from Johannes Berg.

  13) PHY probe failure in stmmac can result in resource leaks and
      double MDIO registery later, from Giuseppe CAVALLARO.

  14) Correct ipv6 checksumming in ip6t_NPT netfilter module, also fix
      address prefix mangling, from YOSHIFUJI Hideaki."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
  net, sctp: remove CONFIG_EXPERIMENTAL
  net: sctp: sctp_v6_get_dst: fix boolean test in dst cache
  batman-adv: Fix NULL pointer dereference in DAT hash collision avoidance
  net/macb: fix race with RX interrupt while doing NAPI
  atl1c: add error checking for pci_map_single functions
  htb: fix values in opt dump
  ixgbe: Only set gso_type to SKB_GSO_TCPV4 as RSC does not support IPv6
  net: fix infinite loop in __skb_recv_datagram()
  net: qmi_wwan: add Yota / Megafon M100-1 4g modem
  mwl8k: fix band for supported channels
  bridge: set priority of STP packets
  mac80211: fix channel selection bug
  arp: fix possible crash in arp_rcv()
  bnx2x: set gso_type
  qlcnic: set gso_type
  ixgbe: fix gso type
  stmmac: mdio register has to fail if the phy is not found
  stmmac: fix macro used for debugging the xmit
  Revert "r8169: enable internal ASPM and clock request settings".
  Revert "r8169: enable ALDPS for power saving".
  ...
parents 42976ad0 3bdb1a44

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+64 −7
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include "atl1c.h"



#define ATL1C_DRV_VERSION "1.0.1.0-NAPI"

#define ATL1C_DRV_VERSION "1.0.1.1-NAPI"

char atl1c_driver_name[] = "atl1c";

char atl1c_driver_version[] = ATL1C_DRV_VERSION;
@@ -1652,6 +1652,7 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter) 
	u16 num_alloc = 0;

	u16 rfd_next_to_use, next_next;

	struct atl1c_rx_free_desc *rfd_desc;

	dma_addr_t mapping;



	next_next = rfd_next_to_use = rfd_ring->next_to_use;

	if (++next_next == rfd_ring->count)
@@ -1678,9 +1679,18 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter) 
		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);

		buffer_info->skb = skb;

		buffer_info->length = adapter->rx_buffer_len;

		buffer_info->dma = pci_map_single(pdev, vir_addr,

		mapping = pci_map_single(pdev, vir_addr,

						buffer_info->length,

						PCI_DMA_FROMDEVICE);

		if (unlikely(pci_dma_mapping_error(pdev, mapping))) {

			dev_kfree_skb(skb);

			buffer_info->skb = NULL;

			buffer_info->length = 0;

			ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);

			netif_warn(adapter, rx_err, adapter->netdev, "RX pci_map_single failed");

			break;

		}

		buffer_info->dma = mapping;

		ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE,

			ATL1C_PCIMAP_FROMDEVICE);

		rfd_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
@@ -2015,7 +2025,29 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, 
	return 0;

}



static void atl1c_tx_map(struct atl1c_adapter *adapter,

static void atl1c_tx_rollback(struct atl1c_adapter *adpt,

			      struct atl1c_tpd_desc *first_tpd,

			      enum atl1c_trans_queue type)

{

	struct atl1c_tpd_ring *tpd_ring = &adpt->tpd_ring[type];

	struct atl1c_buffer *buffer_info;

	struct atl1c_tpd_desc *tpd;

	u16 first_index, index;



	first_index = first_tpd - (struct atl1c_tpd_desc *)tpd_ring->desc;

	index = first_index;

	while (index != tpd_ring->next_to_use) {

		tpd = ATL1C_TPD_DESC(tpd_ring, index);

		buffer_info = &tpd_ring->buffer_info[index];

		atl1c_clean_buffer(adpt->pdev, buffer_info, 0);

		memset(tpd, 0, sizeof(struct atl1c_tpd_desc));

		if (++index == tpd_ring->count)

			index = 0;

	}

	tpd_ring->next_to_use = first_index;

}



static int atl1c_tx_map(struct atl1c_adapter *adapter,

		      struct sk_buff *skb, struct atl1c_tpd_desc *tpd,

			enum atl1c_trans_queue type)

{
@@ -2040,7 +2072,10 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter, 
		buffer_info->length = map_len;

		buffer_info->dma = pci_map_single(adapter->pdev,

					skb->data, hdr_len, PCI_DMA_TODEVICE);

		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);

		if (unlikely(pci_dma_mapping_error(adapter->pdev,

						   buffer_info->dma)))

			goto err_dma;



		ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE,

			ATL1C_PCIMAP_TODEVICE);

		mapped_len += map_len;
@@ -2062,6 +2097,10 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter, 
		buffer_info->dma =

			pci_map_single(adapter->pdev, skb->data + mapped_len,

					buffer_info->length, PCI_DMA_TODEVICE);

		if (unlikely(pci_dma_mapping_error(adapter->pdev,

						   buffer_info->dma)))

			goto err_dma;



		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);

		ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE,

			ATL1C_PCIMAP_TODEVICE);
@@ -2083,6 +2122,9 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter, 
						    frag, 0,

						    buffer_info->length,

						    DMA_TO_DEVICE);

		if (dma_mapping_error(&adapter->pdev->dev, buffer_info->dma))

			goto err_dma;



		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);

		ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_PAGE,

			ATL1C_PCIMAP_TODEVICE);
@@ -2095,6 +2137,13 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter, 
	/* The last buffer info contain the skb address,

	   so it will be free after unmap */

	buffer_info->skb = skb;



	return 0;



err_dma:

	buffer_info->dma = 0;

	buffer_info->length = 0;

	return -1;

}



static void atl1c_tx_queue(struct atl1c_adapter *adapter, struct sk_buff *skb,
@@ -2157,10 +2206,18 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb, 
	if (skb_network_offset(skb) != ETH_HLEN)

		tpd->word1 |= 1 << TPD_ETH_TYPE_SHIFT; /* Ethernet frame */



	atl1c_tx_map(adapter, skb, tpd, type);

	if (atl1c_tx_map(adapter, skb, tpd, type) < 0) {

		netif_info(adapter, tx_done, adapter->netdev,

			   "tx-skb droppted due to dma error\n");

		/* roll back tpd/buffer */

		atl1c_tx_rollback(adapter, tpd, type);

		spin_unlock_irqrestore(&adapter->tx_lock, flags);

		dev_kfree_skb(skb);

	} else {

		atl1c_tx_queue(adapter, skb, tpd, type);



		spin_unlock_irqrestore(&adapter->tx_lock, flags);

	}



	return NETDEV_TX_OK;

}

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

+5 −7
Original line number Diff line number Diff line
@@ -504,8 +504,6 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp, 
		skb_shinfo(skb)->gso_size = bnx2x_set_lro_mss(bp,

					tpa_info->parsing_flags, len_on_bd);



		/* set for GRO */

		if (fp->mode == TPA_MODE_GRO)

		skb_shinfo(skb)->gso_type =

			(GET_FLAG(tpa_info->parsing_flags,

				  PARSING_FLAGS_OVER_ETHERNET_PROTOCOL) ==

drivers/net/ethernet/cadence/macb.c

+5 −0
Original line number Diff line number Diff line
@@ -693,6 +693,11 @@ static int macb_poll(struct napi_struct *napi, int budget) 
		 * get notified when new packets arrive.

		 */

		macb_writel(bp, IER, MACB_RX_INT_FLAGS);



		/* Packets received while interrupts were disabled */

		status = macb_readl(bp, RSR);

		if (unlikely(status))

			napi_reschedule(napi);

	}



	/* TODO: Handle errors */

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,7 @@ static void ixgbe_set_rsc_gso_size(struct ixgbe_ring *ring, 
	/* set gso_size to avoid messing up TCP MSS */

	skb_shinfo(skb)->gso_size = DIV_ROUND_UP((skb->len - hdr_len),

						 IXGBE_CB(skb)->append_cnt);

	skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;

}



static void ixgbe_update_rsc_stats(struct ixgbe_ring *rx_ring,

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c

+6 −1
Original line number Diff line number Diff line
@@ -986,8 +986,13 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter, 
	th->seq = htonl(seq_number);

	length = skb->len;



	if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP)

	if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP) {

		skb_shinfo(skb)->gso_size = qlcnic_get_lro_sts_mss(sts_data1);

		if (skb->protocol == htons(ETH_P_IPV6))

			skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;

		else

			skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;

	}



	if (vid != 0xffff)

		__vlan_hwaccel_put_tag(skb, vid);