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

Commit d0b952a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits)
  [ETHTOOL]: Fix UFO typo
  [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.
  [SCTP]: Send only 1 window update SACK per message.
  [SCTP]: Don't do CRC32C checksum over loopback.
  [SCTP] Reset rtt_in_progress for the chunk when processing its sack.
  [SCTP]: Reject sctp packets with broadcast addresses.
  [SCTP]: Limit association max_retrans setting in setsockopt.
  [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.
  [IPV6]: Sum real space for RTAs.
  [IRDA]: Use put_unaligned() in irlmp_do_discovery().
  [BRIDGE]: Add support for NETIF_F_HW_CSUM devices
  [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
  [TG3]: Convert to non-LLTX
  [TG3]: Remove unnecessary tx_lock
  [TCP]: Add tcp_slow_start_after_idle sysctl.
  [BNX2]: Update version and reldate
  [BNX2]: Use CPU native page size
  [BNX2]: Use compressed firmware
  [BNX2]: Add firmware decompression
  [BNX2]: Allow WoL settings on new 5708 chips
  ...

Manual fixup for conflict in drivers/net/tulip/winbond-840.c
parents d90125bf 47552c4e

Documentation/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,15 @@ running once the system is up. 
			If enabled at boot time, /selinux/disable can be used

			later to disable prior to initial policy load.



	selinux_compat_net =

			[SELINUX] Set initial selinux_compat_net flag value.

                        Format: { "0" | "1" }

                        0 -- use new secmark-based packet controls

                        1 -- use legacy packet controls

                        Default value is 0 (preferred).

                        Value can be changed at runtime via

                        /selinux/compat_net.



	serialnumber	[BUGS=IA-32]



	sg_def_reserved_size=	[SCSI]

Documentation/networking/ip-sysctl.txt

+7 −0
Original line number Diff line number Diff line
@@ -362,6 +362,13 @@ tcp_workaround_signed_windows - BOOLEAN 
	not receive a window scaling option from them.

	Default: 0



tcp_slow_start_after_idle - BOOLEAN

	If set, provide RFC2861 behavior and time out the congestion

	window after an idle period.  An idle period is defined at

	the current RTO.  If unset, the congestion window will not

	be timed out after an idle period.

	Default: 1



IP Variables:



ip_local_port_range - 2 INTEGERS

Documentation/networking/netdevices.txt

+4 −4
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ dev->get_stats: 
	Context: nominally process, but don't sleep inside an rwlock



dev->hard_start_xmit:

	Synchronization: dev->xmit_lock spinlock.

	Synchronization: netif_tx_lock spinlock.

	When the driver sets NETIF_F_LLTX in dev->features this will be

	called without holding xmit_lock. In this case the driver 

	called without holding netif_tx_lock. In this case the driver

	has to lock by itself when needed. It is recommended to use a try lock

	for this and return -1 when the spin lock fails. 

	The locking there should also properly protect against
@@ -62,12 +62,12 @@ dev->hard_start_xmit: 
	  Only valid when NETIF_F_LLTX is set.



dev->tx_timeout:

	Synchronization: dev->xmit_lock spinlock.

	Synchronization: netif_tx_lock spinlock.

	Context: BHs disabled

	Notes: netif_queue_stopped() is guaranteed true



dev->set_multicast_list:

	Synchronization: dev->xmit_lock spinlock.

	Synchronization: netif_tx_lock spinlock.

	Context: BHs disabled



dev->poll:

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -72,4 +72,6 @@ source "drivers/edac/Kconfig" 


source "drivers/rtc/Kconfig"



source "drivers/dma/Kconfig"



endmenu

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -74,3 +74,4 @@ obj-$(CONFIG_SGI_SN) += sn/ 
obj-y				+= firmware/

obj-$(CONFIG_CRYPTO)		+= crypto/

obj-$(CONFIG_SUPERH)		+= sh/

obj-$(CONFIG_DMA_ENGINE)	+= dma/