tcp: don't backtrack to sacked skbs

[linux-2.6-omap-h63xx.git] / net / ipv4 / ip_gre.c

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 4a43739c9035df34a6ec0344662a2d8dab9c6325..e62510d5ea5a60df6b806342e870ace458108962 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -172,11 +172,11 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev,
        int link = dev->ifindex;
        unsigned h0 = HASH(remote);
        unsigned h1 = HASH(key);
-       struct ip_tunnel *t, *sel[4] = { NULL, NULL, NULL, NULL };
+       struct ip_tunnel *t, *cand = NULL;
        struct ipgre_net *ign = net_generic(net, ipgre_net_id);
        int dev_type = (gre_proto == htons(ETH_P_TEB)) ?
                       ARPHRD_ETHER : ARPHRD_IPGRE;
-       int idx;
+       int score, cand_score = 4;
 
        for (t = ign->tunnels_r_l[h0^h1]; t; t = t->next) {
                if (local != t->parms.iph.saddr ||
@@ -189,15 +189,18 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev,
                    t->dev->type != dev_type)
                        continue;
 
-               idx = 0;
+               score = 0;
                if (t->parms.link != link)
-                       idx |= 1;
+                       score |= 1;
                if (t->dev->type != dev_type)
-                       idx |= 2;
-               if (idx == 0)
+                       score |= 2;
+               if (score == 0)
                        return t;
-               if (sel[idx] == NULL)
-                       sel[idx] = t;
+
+               if (score < cand_score) {
+                       cand = t;
+                       cand_score = score;
+               }
        }
 
        for (t = ign->tunnels_r[h0^h1]; t; t = t->next) {
@@ -210,15 +213,18 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev,
                    t->dev->type != dev_type)
                        continue;
 
-               idx = 0;
+               score = 0;
                if (t->parms.link != link)
-                       idx |= 1;
+                       score |= 1;
                if (t->dev->type != dev_type)
-                       idx |= 2;
-               if (idx == 0)
+                       score |= 2;
+               if (score == 0)
                        return t;
-               if (sel[idx] == NULL)
-                       sel[idx] = t;
+
+               if (score < cand_score) {
+                       cand = t;
+                       cand_score = score;
+               }
        }
 
        for (t = ign->tunnels_l[h1]; t; t = t->next) {
@@ -233,15 +239,18 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev,
                    t->dev->type != dev_type)
                        continue;
 
-               idx = 0;
+               score = 0;
                if (t->parms.link != link)
-                       idx |= 1;
+                       score |= 1;
                if (t->dev->type != dev_type)
-                       idx |= 2;
-               if (idx == 0)
+                       score |= 2;
+               if (score == 0)
                        return t;
-               if (sel[idx] == NULL)
-                       sel[idx] = t;
+
+               if (score < cand_score) {
+                       cand = t;
+                       cand_score = score;
+               }
        }
 
        for (t = ign->tunnels_wc[h1]; t; t = t->next) {
@@ -253,20 +262,22 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev,
                    t->dev->type != dev_type)
                        continue;
 
-               idx = 0;
+               score = 0;
                if (t->parms.link != link)
-                       idx |= 1;
+                       score |= 1;
                if (t->dev->type != dev_type)
-                       idx |= 2;
-               if (idx == 0)
+                       score |= 2;
+               if (score == 0)
                        return t;
-               if (sel[idx] == NULL)
-                       sel[idx] = t;
+
+               if (score < cand_score) {
+                       cand = t;
+                       cand_score = score;
+               }
        }
 
-       for (idx = 1; idx < ARRAY_SIZE(sel); idx++)
-               if (sel[idx] != NULL)
-                       return sel[idx];
+       if (cand != NULL)
+               return cand;
 
        if (ign->fb_tunnel_dev->flags & IFF_UP)
                return netdev_priv(ign->fb_tunnel_dev);
@@ -480,7 +491,7 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
        if (t->parms.iph.ttl == 0 && type == ICMP_TIME_EXCEEDED)
                goto out;
 
-       if (jiffies - t->err_time < IPTUNNEL_ERR_TIMEO)
+       if (time_before(jiffies, t->err_time + IPTUNNEL_ERR_TIMEO))
                t->err_count++;
        else
                t->err_count = 1;
@@ -792,7 +803,8 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
 
        if (tunnel->err_count > 0) {
-               if (jiffies - tunnel->err_time < IPTUNNEL_ERR_TIMEO) {
+               if (time_before(jiffies,
+                               tunnel->err_time + IPTUNNEL_ERR_TIMEO)) {
                        tunnel->err_count--;
 
                        dst_link_failure(skb);