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

Commit 12145387 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:
  [BNX2]: Fix occasional NETDEV WATCHDOG on 5709.
  [IPV6]: Disallow RH0 by default.
  [XFRM]: beet: fix pseudo header length value
  [TCP]: Congestion control initialization.
parents 6f4c5bde 68c9f75a

Documentation/networking/ip-sysctl.txt

+9 −0
Original line number Diff line number Diff line
@@ -851,6 +851,15 @@ accept_redirects - BOOLEAN 
	Functional default: enabled if local forwarding is disabled.

			    disabled if local forwarding is enabled.



accept_source_route - INTEGER

	Accept source routing (routing extension header).



	> 0: Accept routing header.

	= 0: Accept only routing header type 2.

	< 0: Do not accept routing header.



	Default: 0



autoconf - BOOLEAN

	Autoconfigure addresses using Prefix Information in Router 

	Advertisements.

drivers/net/bnx2.c

+5 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.5.7"

#define DRV_MODULE_RELDATE	"March 29, 2007"

#define DRV_MODULE_VERSION	"1.5.8"

#define DRV_MODULE_RELDATE	"April 24, 2007"



#define RUN_AT(x) (jiffies + (x))
@@ -3421,6 +3421,9 @@ bnx2_init_chip(struct bnx2 *bp) 
	val = REG_RD(bp, BNX2_MQ_CONFIG);

	val &= ~BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE;

	val |= BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_256;

	if (CHIP_ID(bp) == CHIP_ID_5709_A0 || CHIP_ID(bp) == CHIP_ID_5709_A1)

		val |= BNX2_MQ_CONFIG_HALT_DIS;



	REG_WR(bp, BNX2_MQ_CONFIG, val);



	val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE);

drivers/net/bnx2.h

+1 −0
Original line number Diff line number Diff line
@@ -6518,6 +6518,7 @@ struct bnx2 { 
#define CHIP_ID_5708_B0			0x57081000

#define CHIP_ID_5708_B1			0x57081010

#define CHIP_ID_5709_A0			0x57090000

#define CHIP_ID_5709_A1			0x57090010



#define CHIP_BOND_ID(bp)		(((bp)->chip_id) & 0xf)

include/linux/ipv6.h

+3 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ struct ipv6_devconf { 
#endif

#endif

	__s32		proxy_ndp;

	__s32		accept_source_route;

	void		*sysctl;

};
@@ -205,6 +206,8 @@ enum { 
	DEVCONF_RTR_PROBE_INTERVAL,

	DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,

	DEVCONF_PROXY_NDP,

	__DEVCONF_OPTIMISTIC_DAD,

	DEVCONF_ACCEPT_SOURCE_ROUTE,

	DEVCONF_MAX

};

include/linux/sysctl.h

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ enum { 
	NET_IPV6_RTR_PROBE_INTERVAL=21,

	NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,

	NET_IPV6_PROXY_NDP=23,

	NET_IPV6_ACCEPT_SOURCE_ROUTE=25,

	__NET_IPV6_MAX

};