7 files changed, 25 insertions, 47 deletions

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 91f3a5cdbcf8..9e8ef509c51d 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -442,7 +442,7 @@ config INET_DIAG
         ---help---
           Support for INET (TCP, DCCP, etc) socket monitoring interface used by
           native Linux tools such as ss. ss is included in iproute2, currently
-          downloadable at <http://developer.osdl.org/dev/iproute2>. 
+          downloadable at <http://linux-net.osdl.org/index.php/Iproute2>.
           
           If unsure, say Y.
 
@@ -550,7 +550,7 @@ config TCP_CONG_SCALABLE
         Scalable TCP is a sender-side only change to TCP which uses a
         MIMD congestion control algorithm which has some nice scaling
         properties, though is known to have fairness issues.
-        See http://www-lce.eng.cam.ac.uk/~ctk21/scalable/
+        See http://www.deneholme.net/tom/scalable/
 
 config TCP_CONG_LP
         tristate "TCP Low Priority"
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 8a0ec10a13a7..e10794dc5f64 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1054,12 +1054,14 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
         ASSERT_RTNL();
 
         if (!in_dev) {
-                if (event == NETDEV_REGISTER && dev == &loopback_dev) {
+                if (event == NETDEV_REGISTER) {
                         in_dev = inetdev_init(dev);
                         if (!in_dev)
                                 panic("devinet: Failed to create loopback\n");
-                        in_dev->cnf.no_xfrm = 1;
-                        in_dev->cnf.no_policy = 1;
+                        if (dev == &loopback_dev) {
+                                in_dev->cnf.no_xfrm = 1;
+                                in_dev->cnf.no_policy = 1;
+                        }
                 }
                 goto out;
         }
diff --git a/net/ipv4/multipath_random.c b/net/ipv4/multipath_random.c
index 57f481498fbb..c312785d14d0 100644
--- a/net/ipv4/multipath_random.c
+++ b/net/ipv4/multipath_random.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/mroute.h>
 #include <linux/init.h>
+#include <linux/random.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
@@ -48,21 +49,6 @@
 
 #define MULTIPATH_MAX_CANDIDATES 40
 
-/* interface to random number generation */
-static unsigned int RANDOM_SEED = 93186752;
-
-static inline unsigned int random(unsigned int ubound)
-{
-        static unsigned int a = 1588635695,
-                q = 2,
-                r = 1117695901;
-
-        RANDOM_SEED = a*(RANDOM_SEED % q) - r*(RANDOM_SEED / q);
-
-        return RANDOM_SEED % ubound;
-}
-
-
 static void random_select_route(const struct flowi *flp,
                                 struct rtable *first,
                                 struct rtable **rp)
@@ -84,7 +70,7 @@ static void random_select_route(const struct flowi *flp,
         if (candidate_count > 1) {
                 unsigned char i = 0;
                 unsigned char candidate_no = (unsigned char)
-                        random(candidate_count);
+                        (random32() % candidate_count);
 
                 /* find chosen candidate and adjust GC data for all candidates
                  * to ensure they stay in cache
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c
index 2bdbb92b450a..57c503694539 100644
--- a/net/ipv4/multipath_wrandom.c
+++ b/net/ipv4/multipath_wrandom.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/mroute.h>
 #include <linux/init.h>
+#include <linux/random.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
@@ -84,18 +85,6 @@ struct multipath_route {
 /* state: primarily weight per route information */
 static struct multipath_bucket state[MULTIPATH_STATE_SIZE];
 
-/* interface to random number generation */
-static unsigned int RANDOM_SEED = 93186752;
-
-static inline unsigned int random(unsigned int ubound)
-{
-        static unsigned int a = 1588635695,
-                q = 2,
-                r = 1117695901;
-        RANDOM_SEED = a*(RANDOM_SEED % q) - r*(RANDOM_SEED / q);
-        return RANDOM_SEED % ubound;
-}
-
 static unsigned char __multipath_lookup_weight(const struct flowi *fl,
                                                const struct rtable *rt)
 {
@@ -193,7 +182,7 @@ static void wrandom_select_route(const struct flowi *flp,
 
         /* choose a weighted random candidate */
         decision = first;
-        selector = random(power);
+        selector = random32() % power;
         last_power = 0;
 
         /* select candidate, adjust GC data and cleanup local state */
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index ac6516c642a1..74c4d103ebc2 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2266,12 +2266,12 @@ void tcp_free_md5sig_pool(void)
 {
         struct tcp_md5sig_pool **pool = NULL;
 
-        spin_lock(&tcp_md5sig_pool_lock);
+        spin_lock_bh(&tcp_md5sig_pool_lock);
         if (--tcp_md5sig_users == 0) {
                 pool = tcp_md5sig_pool;
                 tcp_md5sig_pool = NULL;
         }
-        spin_unlock(&tcp_md5sig_pool_lock);
+        spin_unlock_bh(&tcp_md5sig_pool_lock);
         if (pool)
                 __tcp_free_md5sig_pool(pool);
 }
@@ -2314,36 +2314,36 @@ struct tcp_md5sig_pool **tcp_alloc_md5sig_pool(void)
         int alloc = 0;
 
 retry:
-        spin_lock(&tcp_md5sig_pool_lock);
+        spin_lock_bh(&tcp_md5sig_pool_lock);
         pool = tcp_md5sig_pool;
         if (tcp_md5sig_users++ == 0) {
                 alloc = 1;
-                spin_unlock(&tcp_md5sig_pool_lock);
+                spin_unlock_bh(&tcp_md5sig_pool_lock);
         } else if (!pool) {
                 tcp_md5sig_users--;
-                spin_unlock(&tcp_md5sig_pool_lock);
+                spin_unlock_bh(&tcp_md5sig_pool_lock);
                 cpu_relax();
                 goto retry;
         } else
-                spin_unlock(&tcp_md5sig_pool_lock);
+                spin_unlock_bh(&tcp_md5sig_pool_lock);
 
         if (alloc) {
                 /* we cannot hold spinlock here because this may sleep. */
                 struct tcp_md5sig_pool **p = __tcp_alloc_md5sig_pool();
-                spin_lock(&tcp_md5sig_pool_lock);
+                spin_lock_bh(&tcp_md5sig_pool_lock);
                 if (!p) {
                         tcp_md5sig_users--;
-                        spin_unlock(&tcp_md5sig_pool_lock);
+                        spin_unlock_bh(&tcp_md5sig_pool_lock);
                         return NULL;
                 }
                 pool = tcp_md5sig_pool;
                 if (pool) {
                         /* oops, it has already been assigned. */
-                        spin_unlock(&tcp_md5sig_pool_lock);
+                        spin_unlock_bh(&tcp_md5sig_pool_lock);
                         __tcp_free_md5sig_pool(p);
                 } else {
                         tcp_md5sig_pool = pool = p;
-                        spin_unlock(&tcp_md5sig_pool_lock);
+                        spin_unlock_bh(&tcp_md5sig_pool_lock);
                 }
         }
         return pool;
@@ -2354,11 +2354,11 @@ EXPORT_SYMBOL(tcp_alloc_md5sig_pool);
 struct tcp_md5sig_pool *__tcp_get_md5sig_pool(int cpu)
 {
         struct tcp_md5sig_pool **p;
-        spin_lock(&tcp_md5sig_pool_lock);
+        spin_lock_bh(&tcp_md5sig_pool_lock);
         p = tcp_md5sig_pool;
         if (p)
                 tcp_md5sig_users++;
-        spin_unlock(&tcp_md5sig_pool_lock);
+        spin_unlock_bh(&tcp_md5sig_pool_lock);
         return (p ? *per_cpu_ptr(p, cpu) : NULL);
 }
 
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index e1cab33fdad1..ceb4376f572a 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -111,6 +111,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
             (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
                 goto out;
 
+        iph = skb->nh.iph;
         if (iph->protocol == IPPROTO_IPIP) {
                 if (x->props.flags & XFRM_STATE_DECAP_DSCP)
                         ipv4_copy_dscp(iph, skb->h.ipiph);
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index fef19c6bcb98..5d51a2af34c1 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -291,7 +291,7 @@ static void xfrm4_dst_destroy(struct dst_entry *dst)
 
         if (likely(xdst->u.rt.idev))
                 in_dev_put(xdst->u.rt.idev);
-        if (dst->xfrm->props.family == AF_INET && likely(xdst->u.rt.peer))
+        if (dst->xfrm && dst->xfrm->props.family == AF_INET && likely(xdst->u.rt.peer))
                 inet_putpeer(xdst->u.rt.peer);
         xfrm_dst_destroy(xdst);
 }