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

Commit 98260daa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking updates from David Miller:

 1) Alexey Kuznetsov noticed we routed TCP resets improperly in the
    assymetric routing case, fix this by reverting a change that made us
    use the incoming interface in the outgoing route key when we didn't
    have a socket context to work with.

 2) TCP sysctl kernel memory leakage to userspace fix from Alan Cox.

 3) Move UAPI bits from David Howells, WIMAX and CAN this time.

 4) Fix TX stalls in e1000e wrt.  Byte Queue Limits, from Hiroaki
    SHIMODA, Denys Fedoryshchenko, and Jesse Brandeburg.

 5) Fix IPV6 crashes in packet generator module, from Amerigo Wang.

 6) Tidies and fixes in the new VXLAN driver from Stephen Hemminger.

 7) Bridge IP options parse doesn't check first if SKB header has at
    least an IP header's worth of content present.  Fix from Sarveshwar
    Bandi.

 8) The kernel now generates compound pages on transmit and the Xen
    netback drivers needs some adjustments in order to handle this.  Fix
    from Ian Campbell.

 9) Turn off ASPM in JME driver, from Kevin Bardon and Matthew Garrett.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)
  mcs7830: Fix link state detection
  net: add doc for in4_pton()
  net: add doc for in6_pton()
  vti: fix sparse bit endian warnings
  tcp: resets are misrouted
  usbnet: Support devices reporting idleness
  Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
  net/ethernet/jme: disable ASPM
  tcp: sysctl interface leaks 16 bytes of kernel memory
  kaweth: print correct debug ptr
  e1000e: Change wthresh to 1 to avoid possible Tx stalls
  ipv4: fix route mark sparse warning
  xen: netback: handle compound page fragments on transmit.
  bridge: Pull ip header into skb->data before looking into ip header.
  isdn: fix a wrapping bug in isdn_ppp_ioctl()
  vxlan: fix oops when give unknown ifindex
  vxlan: fix receive checksum handling
  vxlan: add additional headroom
  vxlan: allow configuring port range
  vxlan: associate with tunnel socket on transmit
  ...
parents e225ca27 dabdaf0c

drivers/isdn/i4l/isdn_ppp.c

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) 
			j = ipc->num / (sizeof(long) * 8);

			i = ipc->num % (sizeof(long) * 8);

			if (j < 8)

				protos[j] |= (0x1 << i);

				protos[j] |= (1UL << i);

			ipc = ipc->next;

		}

		if ((r = set_arg(argp, protos, 8 * sizeof(long))))

drivers/net/ethernet/intel/e1000e/e1000.h

+3 −3
Original line number Diff line number Diff line
@@ -175,13 +175,13 @@ struct e1000_info; 
/*

 * in the case of WTHRESH, it appears at least the 82571/2 hardware

 * writes back 4 descriptors when WTHRESH=5, and 3 descriptors when

 * WTHRESH=4, and since we want 64 bytes at a time written back, set

 * it to 5

 * WTHRESH=4, so a setting of 5 gives the most efficient bus

 * utilization but to avoid possible Tx stalls, set it to 1

 */

#define E1000_TXDCTL_DMA_BURST_ENABLE                          \

	(E1000_TXDCTL_GRAN | /* set descriptor granularity */  \

	 E1000_TXDCTL_COUNT_DESC |                             \

	 (5 << 16) | /* wthresh must be +1 more than desired */\

	 (1 << 16) | /* wthresh must be +1 more than desired */\

	 (1 << 8)  | /* hthresh */                             \

	 0x1f)       /* pthresh */

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -2831,7 +2831,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter) 
		 * set up some performance related parameters to encourage the

		 * hardware to use the bus more efficiently in bursts, depends

		 * on the tx_int_delay to be enabled,

		 * wthresh = 5 ==> burst write a cacheline (64 bytes) at a time

		 * wthresh = 1 ==> burst write is disabled to avoid Tx stalls

		 * hthresh = 1 ==> prefetch when one or more available

		 * pthresh = 0x1f ==> prefetch if internal cache 31 or less

		 * BEWARE: this seems to work but should be considered first if

drivers/net/ethernet/jme.c

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/ethtool.h>
@@ -2973,6 +2974,9 @@ jme_init_one(struct pci_dev *pdev, 
	/*

	 * set up PCI device basics

	 */

	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |

			       PCIE_LINK_STATE_CLKPM);



	rc = pci_enable_device(pdev);

	if (rc) {

		pr_err("Cannot enable PCI device\n");

drivers/net/usb/cdc_eem.c

+4 −0
Original line number Diff line number Diff line
@@ -244,8 +244,12 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
			 *  - suspend: peripheral ready to suspend

			 *  - response: suggest N millisec polling

			 *  - response complete: suggest N sec polling

			 *

			 * Suspend is reported and maybe heeded.

			 */

			case 2:		/* Suspend hint */

				usbnet_device_suggests_idle(dev);

				continue;

			case 3:		/* Response hint */

			case 4:		/* Response complete hint */

				continue;