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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  xfrm: Fix xfrm_policy_gc_lock handling.
  niu: Use pci_ioremap_bar().
  bnx2x: Version Update
  bnx2x: Calling netif_carrier_off at the end of the probe
  bnx2x: PCI configuration bug on big-endian
  bnx2x: Removing the PMF indication when unloading
  mv643xx_eth: fix SMI bus access timeouts
  net: kconfig cleanup
  fs_enet: fix polling
  XFRM: copy_to_user_kmaddress() reports local address twice
  SMC91x: Fix compilation on some platforms.
  udp: Fix the SNMP counter of UDP_MIB_INERRORS
  udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMS
  drivers/net/smc911x.c: Fix lockdep warning on xmit.

3 files changed, 24 insertions, 10 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 71e259e866a1..8b48512ebf6a 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -138,6 +138,7 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
         int peeked;
         int err;
         int is_udplite = IS_UDPLITE(sk);
+        int is_udp4;
 
         if (addr_len)
                 *addr_len=sizeof(struct sockaddr_in6);
@@ -158,6 +159,8 @@ try_again:
         else if (copied < ulen)
                 msg->msg_flags |= MSG_TRUNC;
 
+        is_udp4 = (skb->protocol == htons(ETH_P_IP));
+
         /*
          * If checksum is needed at all, try to do it while copying the
          * data.  If the data is truncated, or if we only want a partial
@@ -180,9 +183,14 @@ try_again:
         if (err)
                 goto out_free;
 
-        if (!peeked)
-                UDP6_INC_STATS_USER(sock_net(sk),
-                                UDP_MIB_INDATAGRAMS, is_udplite);
+        if (!peeked) {
+                if (is_udp4)
+                        UDP_INC_STATS_USER(sock_net(sk),
+                                        UDP_MIB_INDATAGRAMS, is_udplite);
+                else
+                        UDP6_INC_STATS_USER(sock_net(sk),
+                                        UDP_MIB_INDATAGRAMS, is_udplite);
+        }
 
         sock_recv_timestamp(msg, sk, skb);
 
@@ -196,7 +204,7 @@ try_again:
                 sin6->sin6_flowinfo = 0;
                 sin6->sin6_scope_id = 0;
 
-                if (skb->protocol == htons(ETH_P_IP))
+                if (is_udp4)
                         ipv6_addr_set(&sin6->sin6_addr, 0, 0,
                                       htonl(0xffff), ip_hdr(skb)->saddr);
                 else {
@@ -207,7 +215,7 @@ try_again:
                 }
 
         }
-        if (skb->protocol == htons(ETH_P_IP)) {
+        if (is_udp4) {
                 if (inet->cmsg_flags)
                         ip_cmsg_recv(msg, skb);
         } else {
@@ -228,8 +236,14 @@ out:
 
 csum_copy_err:
         lock_sock(sk);
-        if (!skb_kill_datagram(sk, skb, flags))
-                UDP6_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+        if (!skb_kill_datagram(sk, skb, flags)) {
+                if (is_udp4)
+                        UDP_INC_STATS_USER(sock_net(sk),
+                                        UDP_MIB_INERRORS, is_udplite);
+                else
+                        UDP6_INC_STATS_USER(sock_net(sk),
+                                        UDP_MIB_INERRORS, is_udplite);
+        }
         release_sock(sk);
 
         if (flags & MSG_DONTWAIT)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 25872747762c..058f04f54b90 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -315,9 +315,9 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
                 return;
         }
 
-        spin_lock(&xfrm_policy_gc_lock);
+        spin_lock_bh(&xfrm_policy_gc_lock);
         hlist_add_head(&policy->bydst, &xfrm_policy_gc_list);
-        spin_unlock(&xfrm_policy_gc_lock);
+        spin_unlock_bh(&xfrm_policy_gc_lock);
 
         schedule_work(&xfrm_policy_gc_work);
 }
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 4a8a1abb59ee..a278a6f3b991 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1816,7 +1816,7 @@ static int copy_to_user_kmaddress(struct xfrm_kmaddress *k, struct sk_buff *skb)
         uk.family = k->family;
         uk.reserved = k->reserved;
         memcpy(&uk.local, &k->local, sizeof(uk.local));
-        memcpy(&uk.remote, &k->local, sizeof(uk.remote));
+        memcpy(&uk.remote, &k->remote, sizeof(uk.remote));
 
         return nla_put(skb, XFRMA_KMADDRESS, sizeof(uk), &uk);
 }