Commit 3b59bf08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking merge from David Miller:
 "1) Move ixgbe driver over to purely page based buffering on receive.
     From Alexander Duyck.

  2) Add receive packet steering support to e1000e, from Bruce Allan.

  3) Convert TCP MD5 support over to RCU, from Eric Dumazet.

  4) Reduce cpu usage in handling out-of-order TCP packets on modern
     systems, also from Eric Dumazet.

  5) Support the IP{,V6}_UNICAST_IF socket options, making the wine
     folks happy, from Erich Hoover.

  6) Support VLAN trunking from guests in hyperv driver, from Haiyang
     Zhang.

  7) Support byte-queue-limtis in r8169, from Igor Maravic.

  8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but
     was never properly implemented, Jiri Benc fixed that.

  9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.

  10) Support kernel side dump filtering by ctmark in netfilter
      ctnetlink, from Pablo Neira Ayuso.

  11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.

  12) Add new peek socket options to assist with socket migration, from
      Pavel Emelyanov.

  13) Add sch_plug packet scheduler whose queue is controlled by
      userland daemons using explicit freeze and release commands.  From
      Shriram Rajagopalan.

  14) Fix FCOE checksum offload handling on transmit, from Yi Zou."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)
  Fix pppol2tp getsockname()
  Remove printk from rds_sendmsg
  ipv6: fix incorrent ipv6 ipsec packet fragment
  cpsw: Hook up default ndo_change_mtu.
  net: qmi_wwan: fix build error due to cdc-wdm dependecy
  netdev: driver: ethernet: Add TI CPSW driver
  netdev: driver: ethernet: add cpsw address lookup engine support
  phy: add am79c874 PHY support
  mlx4_core: fix race on comm channel
  bonding: send igmp report for its master
  fs_enet: Add MPC5125 FEC support and PHY interface selection
  net: bpf_jit: fix BPF_S_LDX_B_MSH compilation
  net: update the usage of CHECKSUM_UNNECESSARY
  fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx
  net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso
  ixgbe: Fix issues with SR-IOV loopback when flow control is disabled
  net/hyperv: Fix the code handling tx busy
  ixgbe: fix namespace issues when FCoE/DCB is not enabled
  rtlwifi: Remove unused ETH_ADDR_LEN defines
  igbvf: Use ETH_ALEN
  ...

Fix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and
drivers/net/usb/{Kconfig,qmi_wwan.c} as per David.
parents e45836fa bbdb32cb

Documentation/ABI/testing/sysfs-class-net-mesh

+7 −0
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ Description: 
		Defines the penalty which will be applied to an

		originator message's tq-field on every hop.



What:		/sys/class/net/<mesh_iface>/mesh/routing_algo

Date:		Dec 2011

Contact:	Marek Lindner <lindner_marek@yahoo.de>

Description:

		Defines the routing procotol this mesh instance

		uses to find the optimal paths through the mesh.



What:           /sys/class/net/<mesh_iface>/mesh/vis_mode

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Documentation/DocBook/80211.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ 
!Finclude/net/cfg80211.h cfg80211_pmksa

!Finclude/net/cfg80211.h cfg80211_send_rx_auth

!Finclude/net/cfg80211.h cfg80211_send_auth_timeout

!Finclude/net/cfg80211.h __cfg80211_auth_canceled

!Finclude/net/cfg80211.h cfg80211_send_rx_assoc

!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout

!Finclude/net/cfg80211.h cfg80211_send_deauth

Documentation/devicetree/bindings/net/stmmac.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* STMicroelectronics 10/100/1000 Ethernet driver (GMAC)



Required properties:

- compatible: Should be "st,spear600-gmac"

- reg: Address and length of the register set for the device

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

- interrupts: Should contain the STMMAC interrupts

- interrupt-names: Should contain the interrupt names "macirq"

  "eth_wake_irq" if this interrupt is supported in the "interrupts"

  property

- phy-mode: String, operation mode of the PHY interface.

  Supported values are: "mii", "rmii", "gmii", "rgmii".



Optional properties:

- mac-address: 6 bytes, mac address



Examples:



	gmac0: ethernet@e0800000 {

		compatible = "st,spear600-gmac";

		reg = <0xe0800000 0x8000>;

		interrupt-parent = <&vic1>;

		interrupts = <24 23>;

		interrupt-names = "macirq", "eth_wake_irq";

		mac-address = [000000000000]; /* Filled in by U-Boot */

		phy-mode = "gmii";

	};

Documentation/ioctl/ioctl-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ Code Seq#(hex) Include File Comments 
		linux/ixjuser.h		<http://web.archive.org/web/*/http://www.quicknet.net>

'r'	00-1F	linux/msdos_fs.h and fs/fat/dir.c

's'	all	linux/cdk.h

't'	00-7F	linux/if_ppp.h

't'	00-7F	linux/ppp-ioctl.h

't'	80-8F	linux/isdn_ppp.h

't'	90	linux/toshiba.h

'u'	00-1F	linux/smb_fs.h		gone

Documentation/magic-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ TTY_DRIVER_MAGIC 0x5402 tty_driver include/linux/tty_driver.h 
MGSLPC_MAGIC          0x5402      mgslpc_info       drivers/char/pcmcia/synclink_cs.c

TTY_LDISC_MAGIC       0x5403      tty_ldisc         include/linux/tty_ldisc.h

USB_SERIAL_MAGIC      0x6702      usb_serial        drivers/usb/serial/usb-serial.h

FULL_DUPLEX_MAGIC     0x6969                        drivers/net/tulip/de2104x.c

FULL_DUPLEX_MAGIC     0x6969                        drivers/net/ethernet/dec/tulip/de2104x.c

USB_BLUETOOTH_MAGIC   0x6d02      usb_bluetooth     drivers/usb/class/bluetty.c

RFCOMM_TTY_MAGIC      0x6d02                        net/bluetooth/rfcomm/tty.c

USB_SERIAL_PORT_MAGIC 0x7301      usb_serial_port   drivers/usb/serial/usb-serial.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE