9 files changed, 40 insertions, 24 deletions

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 19880b086e71..9c7e5ffb223d 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -343,7 +343,7 @@ config INET_ESP
         tristate "IP: ESP transformation"
         select XFRM
         select CRYPTO
-        select CRYPTO_AEAD
+        select CRYPTO_AUTHENC
         select CRYPTO_HMAC
         select CRYPTO_MD5
         select CRYPTO_CBC
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index f282b26f63eb..87490f7bb0f7 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -752,6 +752,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
                         inet_del_ifa(in_dev, ifap, 0);
                         ifa->ifa_broadcast = 0;
                         ifa->ifa_anycast = 0;
+                        ifa->ifa_scope = 0;
                 }
 
                 ifa->ifa_address = ifa->ifa_local = sin->sin_addr.s_addr;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 906cb1ada4c3..e7821ba7a9a0 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -266,20 +266,24 @@ static struct ip_tunnel * ipgre_tunnel_locate(struct ip_tunnel_parm *parms, int
         if (!dev)
           return NULL;
 
+        if (strchr(name, '%')) {
+                if (dev_alloc_name(dev, name) < 0)
+                        goto failed_free;
+        }
+
         dev->init = ipgre_tunnel_init;
         nt = netdev_priv(dev);
         nt->parms = *parms;
 
-        if (register_netdevice(dev) < 0) {
-                free_netdev(dev);
-                goto failed;
-        }
+        if (register_netdevice(dev) < 0)
+                goto failed_free;
 
         dev_hold(dev);
         ipgre_tunnel_link(nt);
         return nt;
 
-failed:
+failed_free:
+        free_netdev(dev);
         return NULL;
 }
 
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index ae1f45fc23b9..58b60b2fb011 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -108,8 +108,11 @@ static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb)
         const int cpu = get_cpu();
         u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
         struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
-        int err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
+        int err;
 
+        local_bh_disable();
+        err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
+        local_bh_enable();
         if (err)
                 goto out;
 
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 10013ccee8dd..5dd938579eeb 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -753,9 +753,9 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d
                 printk("Unknown ARP type 0x%04x for device %s\n", dev->type, dev->name);
                 b->htype = dev->type; /* can cause undefined behavior */
         }
+
+        /* server_ip and your_ip address are both already zero per RFC2131 */
         b->hlen = dev->addr_len;
-        b->your_ip = NONE;
-        b->server_ip = NONE;
         memcpy(b->hw_addr, dev->dev_addr, dev->addr_len);
         b->secs = htons(jiffies_diff / HZ);
         b->xid = d->xid;
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index e77e3b855834..dbaed69de06a 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -228,20 +228,24 @@ static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int c
         if (dev == NULL)
                 return NULL;
 
+        if (strchr(name, '%')) {
+                if (dev_alloc_name(dev, name) < 0)
+                        goto failed_free;
+        }
+
         nt = netdev_priv(dev);
         dev->init = ipip_tunnel_init;
         nt->parms = *parms;
 
-        if (register_netdevice(dev) < 0) {
-                free_netdev(dev);
-                goto failed;
-        }
+        if (register_netdevice(dev) < 0)
+                goto failed_free;
 
         dev_hold(dev);
         ipip_tunnel_link(nt);
         return nt;
 
-failed:
+failed_free:
+        free_netdev(dev);
         return NULL;
 }
 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 525787b52b72..7b5e8e1d94be 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -542,12 +542,11 @@ static __init int ip_rt_proc_init(struct net *net)
         if (!pde)
                 goto err1;
 
-        pde = create_proc_entry("rt_cache", S_IRUGO, net->proc_net_stat);
+        pde = proc_create("rt_cache", S_IRUGO,
+                          net->proc_net_stat, &rt_cpu_seq_fops);
         if (!pde)
                 goto err2;
 
-        pde->proc_fops = &rt_cpu_seq_fops;
-
 #ifdef CONFIG_NET_CLS_ROUTE
         pde = create_proc_read_entry("rt_acct", 0, net->proc_net,
                         ip_rt_acct_read, NULL);
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c
index 5212ed9b0c98..7eb7636db0d0 100644
--- a/net/ipv4/tcp_bic.c
+++ b/net/ipv4/tcp_bic.c
@@ -1,12 +1,13 @@
 /*
  * Binary Increase Congestion control for TCP
- *
+ * Home page:
+ *      http://netsrv.csc.ncsu.edu/twiki/bin/view/Main/BIC
  * This is from the implementation of BICTCP in
  * Lison-Xu, Kahaled Harfoush, and Injong Rhee.
  *  "Binary Increase Congestion Control for Fast, Long Distance
  *  Networks" in InfoComm 2004
  * Available from:
- *  http://www.csc.ncsu.edu/faculty/rhee/export/bitcp.pdf
+ *  http://netsrv.csc.ncsu.edu/export/bitcp.pdf
  *
  * Unless BIC is enabled and congestion window is large
  * this behaves the same as the original Reno.
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 19c449f62672..7facdb0f6960 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1367,7 +1367,7 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk,
  * a normal way
  */
 static struct sk_buff *tcp_sacktag_skip(struct sk_buff *skb, struct sock *sk,
-                                        u32 skip_to_seq)
+                                        u32 skip_to_seq, int *fack_count)
 {
         tcp_for_write_queue_from(skb, sk) {
                 if (skb == tcp_send_head(sk))
@@ -1375,6 +1375,8 @@ static struct sk_buff *tcp_sacktag_skip(struct sk_buff *skb, struct sock *sk,
 
                 if (!before(TCP_SKB_CB(skb)->end_seq, skip_to_seq))
                         break;
+
+                *fack_count += tcp_skb_pcount(skb);
         }
         return skb;
 }
@@ -1390,7 +1392,7 @@ static struct sk_buff *tcp_maybe_skipping_dsack(struct sk_buff *skb,
                 return skb;
 
         if (before(next_dup->start_seq, skip_to_seq)) {
-                skb = tcp_sacktag_skip(skb, sk, next_dup->start_seq);
+                skb = tcp_sacktag_skip(skb, sk, next_dup->start_seq, fack_count);
                 tcp_sacktag_walk(skb, sk, NULL,
                                  next_dup->start_seq, next_dup->end_seq,
                                  1, fack_count, reord, flag);
@@ -1537,7 +1539,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb,
 
                         /* Head todo? */
                         if (before(start_seq, cache->start_seq)) {
-                                skb = tcp_sacktag_skip(skb, sk, start_seq);
+                                skb = tcp_sacktag_skip(skb, sk, start_seq,
+                                                       &fack_count);
                                 skb = tcp_sacktag_walk(skb, sk, next_dup,
                                                        start_seq,
                                                        cache->start_seq,
@@ -1565,7 +1568,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb,
                                 goto walk;
                         }
 
-                        skb = tcp_sacktag_skip(skb, sk, cache->end_seq);
+                        skb = tcp_sacktag_skip(skb, sk, cache->end_seq,
+                                               &fack_count);
                         /* Check overlap against next cached too (past this one already) */
                         cache++;
                         continue;
@@ -1577,7 +1581,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb,
                                 break;
                         fack_count = tp->fackets_out;
                 }
-                skb = tcp_sacktag_skip(skb, sk, start_seq);
+                skb = tcp_sacktag_skip(skb, sk, start_seq, &fack_count);
 
 walk:
                 skb = tcp_sacktag_walk(skb, sk, next_dup, start_seq, end_seq,