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

4 files changed, 7 insertions, 3 deletions

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 2dfa96b0575e..7dd29b7e461d 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -51,7 +51,7 @@ struct unix_sock {
         struct sock             *peer;
         struct sock             *other;
         struct list_head        link;
-        atomic_t                inflight;
+        atomic_long_t           inflight;
         spinlock_t              lock;
         unsigned int            gc_candidate : 1;
         wait_queue_head_t       peer_wait;
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index dfd8bf66ce27..d364fd594ea4 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -262,7 +262,7 @@ static inline int ieee80211_get_radiotap_len(unsigned char *data)
         struct ieee80211_radiotap_header *hdr =
                 (struct ieee80211_radiotap_header *)data;
 
-        return le16_to_cpu(get_unaligned(&hdr->it_len));
+        return get_unaligned_le16(&hdr->it_len);
 }
 
 #endif                          /* IEEE80211_RADIOTAP_H */
diff --git a/include/net/ip.h b/include/net/ip.h
index b5862b975207..250e6ef025a4 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -188,6 +188,8 @@ extern int sysctl_ip_dynaddr;
 
 extern void ipfrag_init(void);
 
+extern void ip_static_sysctl_init(void);
+
 #ifdef CONFIG_INET
 #include <net/dst.h>
 
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 3855620b78a9..a8eb43cf0c7e 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -38,7 +38,9 @@ struct net {
         struct proc_dir_entry   *proc_net;
         struct proc_dir_entry   *proc_net_stat;
 
-        struct list_head        sysctl_table_headers;
+#ifdef CONFIG_SYSCTL
+        struct ctl_table_set    sysctls;
+#endif
 
         struct net_device       *loopback_dev;          /* The loopback */