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

Commit 6fe4c6d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)
  ipv4: fix redirect handling
  ping: dont increment ICMP_MIB_INERRORS
  sky2: fix hang in napi_disable
  sky2: enforce minimum ring size
  bonding: Don't allow mode change via sysfs with slaves present
  f_phonet: fix page offset of first received fragment
  stmmac: fix pm functions avoiding sleep on spinlock
  stmmac: remove spin_lock in stmmac_ioctl.
  stmmac: parameters auto-tuning through HW cap reg
  stmmac: fix advertising 1000Base capabilties for non GMII iface
  stmmac: use mdelay on timeout of sw reset
  sky2: version 1.30
  sky2: used fixed RSS key
  sky2: reduce default Tx ring size
  sky2: rename up/down functions
  sky2: pci posting issues
  sky2: fix hang on shutdown (and other irq issues)
  r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list
  MAINTAINERS: change email address for shemminger
  pch_gbe: Move #include of module.h
  ...
parents a4cc3889 9cc20b26

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ip_no_pmtu_disc - BOOLEAN 
	default FALSE



min_pmtu - INTEGER

	default 562 - minimum discovered Path MTU

	default 552 - minimum discovered Path MTU



route/max_size - INTEGER

	Maximum number of routes allowed in the kernel.  Increase

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -2586,7 +2586,7 @@ S: Maintained 
F:	drivers/net/ethernet/i825xx/eexpress.*



ETHERNET BRIDGE

M:	Stephen Hemminger <shemminger@linux-foundation.org>

M:	Stephen Hemminger <shemminger@vyatta.com>

L:	bridge@lists.linux-foundation.org

L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net:Bridge
@@ -4473,7 +4473,7 @@ S: Supported 
F:	drivers/infiniband/hw/nes/



NETEM NETWORK EMULATOR

M:	Stephen Hemminger <shemminger@linux-foundation.org>

M:	Stephen Hemminger <shemminger@vyatta.com>

L:	netem@lists.linux-foundation.org

S:	Maintained

F:	net/sched/sch_netem.c
@@ -5988,7 +5988,7 @@ S: Maintained 
F:	drivers/usb/misc/sisusbvga/



SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS

M:	Stephen Hemminger <shemminger@linux-foundation.org>

M:	Stephen Hemminger <shemminger@vyatta.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/marvell/sk*

arch/cris/arch-v10/drivers/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ if ETRAX_ARCH_V10 
config ETRAX_ETHERNET

	bool "Ethernet support"

	depends on ETRAX_ARCH_V10

	select NET_ETHERNET

	select ETHERNET

	select NET_CORE

	select MII

	help

arch/cris/arch-v32/drivers/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ if ETRAX_ARCH_V32 
config ETRAX_ETHERNET

	bool "Ethernet support"

	depends on ETRAX_ARCH_V32

	select NET_ETHERNET

	select ETHERNET

	select NET_CORE

	select MII

	help

drivers/bluetooth/btusb.c

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ static struct usb_device_id btusb_table[] = { 
	/* Canyon CN-BTU1 with HID interfaces */

	{ USB_DEVICE(0x0c10, 0x0000) },



	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x413c, 0x8197) },



	{ }	/* Terminating entry */

};