From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 15:55:01 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d7fc02c7bae7b1cf69269992cf880a43a350cdaa;p=linux-beck.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
  mac80211: fix reorder buffer release
  iwmc3200wifi: Enable wimax core through module parameter
  iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
  iwmc3200wifi: Coex table command does not expect a response
  iwmc3200wifi: Update wiwi priority table
  iwlwifi: driver version track kernel version
  iwlwifi: indicate uCode type when fail dump error/event log
  iwl3945: remove duplicated event logging code
  b43: fix two warnings
  ipw2100: fix rebooting hang with driver loaded
  cfg80211: indent regulatory messages with spaces
  iwmc3200wifi: fix NULL pointer dereference in pmkid update
  mac80211: Fix TX status reporting for injected data frames
  ath9k: enable 2GHz band only if the device supports it
  airo: Fix integer overflow warning
  rt2x00: Fix padding bug on L2PAD devices.
  WE: Fix set events not propagated
  b43legacy: avoid PPC fault during resume
  b43: avoid PPC fault during resume
  tcp: fix a timewait refcnt race
  ...

Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
	kernel/sysctl_check.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/addrconf.c
	net/sctp/sysctl.c
---

d7fc02c7bae7b1cf69269992cf880a43a350cdaa
diff --cc net/ipv4/sysctl_net_ipv4.c
index 300056732953,13f7ab6ad6a0..7e3712ce3994
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@@ -568,7 -712,16 +568,14 @@@ static struct ctl_table ipv4_table[] = 
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
  	},
+ 	{
 -		.ctl_name	= CTL_UNNUMBERED,
+ 		.procname	= "tcp_cookie_size",
+ 		.data		= &sysctl_tcp_cookie_size,
+ 		.maxlen		= sizeof(int),
+ 		.mode		= 0644,
+ 		.proc_handler	= proc_dointvec
+ 	},
  	{
 -		.ctl_name	= CTL_UNNUMBERED,
  		.procname	= "udp_mem",
  		.data		= &sysctl_udp_mem,
  		.maxlen		= sizeof(sysctl_udp_mem),
diff --cc net/ipv6/addrconf.c
index f918399c985c,b1ce8fc62049..de7a194a64ab
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@@ -4284,8 -4387,16 +4319,15 @@@ static struct addrconf_sysctl_tabl
  			.mode		=	0644,
  			.proc_handler	=	proc_dointvec,
  		},
+ 		{
 -			.ctl_name       = CTL_UNNUMBERED,
+ 			.procname       = "force_tllao",
+ 			.data           = &ipv6_devconf.force_tllao,
+ 			.maxlen         = sizeof(int),
+ 			.mode           = 0644,
+ 			.proc_handler   = proc_dointvec
+ 		},
  		{
 -			.ctl_name	=	0,	/* sentinel */
 +			/* sentinel */
  		}
  	},
  };
diff --cc net/sctp/sysctl.c
index d50a042f9552,ae03ded2bf1a..419e1e962c55
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@@ -241,7 -285,19 +242,18 @@@ static ctl_table sctp_table[] = 
  		.extra1		= &zero,
  		.extra2		= &addr_scope_max,
  	},
- 	{ }
+ 	{
 -		.ctl_name	= CTL_UNNUMBERED,
+ 		.procname	= "rwnd_update_shift",
+ 		.data		= &sctp_rwnd_upd_shift,
+ 		.maxlen		= sizeof(int),
+ 		.mode		= 0644,
+ 		.proc_handler	= &proc_dointvec_minmax,
+ 		.strategy	= &sysctl_intvec,
+ 		.extra1		= &one,
+ 		.extra2		= &rwnd_scale_max,
+ 	},
+ 
 -	{ .ctl_name = 0 }
++	{ /* sentinel */ }
  };
  
  static struct ctl_path sctp_path[] = {