Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 42 insertions, 18 deletions

diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index 38bc157876f3..fdcfca3e9208 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -11,6 +11,7 @@
 
 #include <linux/mm.h>
 #include <linux/sysctl.h>
+#include "dccp.h"
 #include "feat.h"
 
 #ifndef CONFIG_SYSCTL
@@ -19,53 +20,76 @@
 
 static struct ctl_table dccp_default_table[] = {
         {
-                .ctl_name       = NET_DCCP_DEFAULT_SEQ_WINDOW,
                 .procname       = "seq_window",
-                .data           = &dccp_feat_default_sequence_window,
-                .maxlen         = sizeof(dccp_feat_default_sequence_window),
+                .data           = &sysctl_dccp_feat_sequence_window,
+                .maxlen         = sizeof(sysctl_dccp_feat_sequence_window),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_DCCP_DEFAULT_RX_CCID,
                 .procname       = "rx_ccid",
-                .data           = &dccp_feat_default_rx_ccid,
-                .maxlen         = sizeof(dccp_feat_default_rx_ccid),
+                .data           = &sysctl_dccp_feat_rx_ccid,
+                .maxlen         = sizeof(sysctl_dccp_feat_rx_ccid),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_DCCP_DEFAULT_TX_CCID,
                 .procname       = "tx_ccid",
-                .data           = &dccp_feat_default_tx_ccid,
-                .maxlen         = sizeof(dccp_feat_default_tx_ccid),
+                .data           = &sysctl_dccp_feat_tx_ccid,
+                .maxlen         = sizeof(sysctl_dccp_feat_tx_ccid),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_DCCP_DEFAULT_ACK_RATIO,
                 .procname       = "ack_ratio",
-                .data           = &dccp_feat_default_ack_ratio,
-                .maxlen         = sizeof(dccp_feat_default_ack_ratio),
+                .data           = &sysctl_dccp_feat_ack_ratio,
+                .maxlen         = sizeof(sysctl_dccp_feat_ack_ratio),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_DCCP_DEFAULT_SEND_ACKVEC,
                 .procname       = "send_ackvec",
-                .data           = &dccp_feat_default_send_ack_vector,
-                .maxlen         = sizeof(dccp_feat_default_send_ack_vector),
+                .data           = &sysctl_dccp_feat_send_ack_vector,
+                .maxlen         = sizeof(sysctl_dccp_feat_send_ack_vector),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_DCCP_DEFAULT_SEND_NDP,
                 .procname       = "send_ndp",
-                .data           = &dccp_feat_default_send_ndp_count,
-                .maxlen         = sizeof(dccp_feat_default_send_ndp_count),
+                .data           = &sysctl_dccp_feat_send_ndp_count,
+                .maxlen         = sizeof(sysctl_dccp_feat_send_ndp_count),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
+        {
+                .procname       = "request_retries",
+                .data           = &sysctl_dccp_request_retries,
+                .maxlen         = sizeof(sysctl_dccp_request_retries),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec,
+        },
+        {
+                .procname       = "retries1",
+                .data           = &sysctl_dccp_retries1,
+                .maxlen         = sizeof(sysctl_dccp_retries1),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec,
+        },
+        {
+                .procname       = "retries2",
+                .data           = &sysctl_dccp_retries2,
+                .maxlen         = sizeof(sysctl_dccp_retries2),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec,
+        },
+        {
+                .procname       = "tx_qlen",
+                .data           = &sysctl_dccp_tx_qlen,
+                .maxlen         = sizeof(sysctl_dccp_tx_qlen),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec,
+        },
+
         { .ctl_name = 0, }
 };