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

3 files changed, 11 insertions, 11 deletions

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 51bd0fd9c9f0..acba3dfc8d29 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -273,11 +273,11 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                         case AF_INET: {
                                 struct inet_sock *inet = inet_sk(sk);
 
-                                print_ipv4_addr(ab, inet->rcv_saddr,
-                                                inet->sport,
+                                print_ipv4_addr(ab, inet->inet_rcv_saddr,
+                                                inet->inet_sport,
                                                 "laddr", "lport");
-                                print_ipv4_addr(ab, inet->daddr,
-                                                inet->dport,
+                                print_ipv4_addr(ab, inet->inet_daddr,
+                                                inet->inet_dport,
                                                 "faddr", "fport");
                                 break;
                         }
@@ -286,10 +286,10 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                                 struct ipv6_pinfo *inet6 = inet6_sk(sk);
 
                                 print_ipv6_addr(ab, &inet6->rcv_saddr,
-                                                inet->sport,
+                                                inet->inet_sport,
                                                 "laddr", "lport");
                                 print_ipv6_addr(ab, &inet6->daddr,
-                                                inet->dport,
+                                                inet->inet_dport,
                                                 "faddr", "fport");
                                 break;
                         }
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index c96d63ec4753..7a374c2eb043 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4093,7 +4093,7 @@ static int selinux_sock_rcv_skb_compat(struct sock *sk, struct sk_buff *skb,
         char *addrp;
 
         COMMON_AUDIT_DATA_INIT(&ad, NET);
-        ad.u.net.netif = skb->iif;
+        ad.u.net.netif = skb->skb_iif;
         ad.u.net.family = family;
         err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
         if (err)
@@ -4155,7 +4155,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 return 0;
 
         COMMON_AUDIT_DATA_INIT(&ad, NET);
-        ad.u.net.netif = skb->iif;
+        ad.u.net.netif = skb->skb_iif;
         ad.u.net.family = family;
         err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
         if (err)
@@ -4167,7 +4167,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 err = selinux_skb_peerlbl_sid(skb, family, &peer_sid);
                 if (err)
                         return err;
-                err = selinux_inet_sys_rcv_skb(skb->iif, addrp, family,
+                err = selinux_inet_sys_rcv_skb(skb->skb_iif, addrp, family,
                                                peer_sid, &ad);
                 if (err) {
                         selinux_netlbl_err(skb, err, 0);
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index c33b6bb9b6dd..529c9ca65878 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2602,7 +2602,7 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
 #ifdef CONFIG_AUDIT
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
         ad.a.u.net.family = sk->sk_family;
-        ad.a.u.net.netif = skb->iif;
+        ad.a.u.net.netif = skb->skb_iif;
         ipv4_skb_to_auditdata(skb, &ad.a, NULL);
 #endif
         /*
@@ -2757,7 +2757,7 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
 #ifdef CONFIG_AUDIT
         smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
         ad.a.u.net.family = family;
-        ad.a.u.net.netif = skb->iif;
+        ad.a.u.net.netif = skb->skb_iif;
         ipv4_skb_to_auditdata(skb, &ad.a, NULL);
 #endif
         /*