6 files changed, 23 insertions, 35 deletions

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index e7d26d9943c2..8ce0ce2ee48e 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -71,7 +71,7 @@ struct ipfrag_skb_cb
 
 /* Describe an entry in the "incomplete datagrams" queue. */
 struct ipq {
-        struct ipq      *next;          /* linked list pointers                 */
+        struct hlist_node list;
         struct list_head lru_list;      /* lru list member                      */
         u32             user;
         u32             saddr;
@@ -89,7 +89,6 @@ struct ipq {
         spinlock_t      lock;
         atomic_t        refcnt;
         struct timer_list timer;        /* when will this queue expire?         */
-        struct ipq      **pprev;
         int             iif;
         struct timeval  stamp;
 };
@@ -99,7 +98,7 @@ struct ipq {
 #define IPQ_HASHSZ      64
 
 /* Per-bucket lock is easy to add now. */
-static struct ipq *ipq_hash[IPQ_HASHSZ];
+static struct hlist_head ipq_hash[IPQ_HASHSZ];
 static DEFINE_RWLOCK(ipfrag_lock);
 static u32 ipfrag_hash_rnd;
 static LIST_HEAD(ipq_lru_list);
@@ -107,9 +106,7 @@ int ip_frag_nqueues = 0;
 
 static __inline__ void __ipq_unlink(struct ipq *qp)
 {
-        if(qp->next)
-                qp->next->pprev = qp->pprev;
-        *qp->pprev = qp->next;
+        hlist_del(&qp->list);
         list_del(&qp->lru_list);
         ip_frag_nqueues--;
 }
@@ -139,27 +136,18 @@ static void ipfrag_secret_rebuild(unsigned long dummy)
         get_random_bytes(&ipfrag_hash_rnd, sizeof(u32));
         for (i = 0; i < IPQ_HASHSZ; i++) {
                 struct ipq *q;
+                struct hlist_node *p, *n;
 
-                q = ipq_hash[i];
-                while (q) {
-                        struct ipq *next = q->next;
+                hlist_for_each_entry_safe(q, p, n, &ipq_hash[i], list) {
                         unsigned int hval = ipqhashfn(q->id, q->saddr,
                                                       q->daddr, q->protocol);
 
                         if (hval != i) {
-                                /* Unlink. */
-                                if (q->next)
-                                        q->next->pprev = q->pprev;
-                                *q->pprev = q->next;
+                                hlist_del(&q->list);
 
                                 /* Relink to new hash chain. */
-                                if ((q->next = ipq_hash[hval]) != NULL)
-                                        q->next->pprev = &q->next;
-                                ipq_hash[hval] = q;
-                                q->pprev = &ipq_hash[hval];
+                                hlist_add_head(&q->list, &ipq_hash[hval]);
                         }
-
-                        q = next;
                 }
         }
         write_unlock(&ipfrag_lock);
@@ -310,14 +298,16 @@ out:
 static struct ipq *ip_frag_intern(unsigned int hash, struct ipq *qp_in)
 {
         struct ipq *qp;
-
+#ifdef CONFIG_SMP
+        struct hlist_node *n;
+#endif
         write_lock(&ipfrag_lock);
 #ifdef CONFIG_SMP
         /* With SMP race we have to recheck hash table, because
          * such entry could be created on other cpu, while we
          * promoted read lock to write lock.
          */
-        for(qp = ipq_hash[hash]; qp; qp = qp->next) {
+        hlist_for_each_entry(qp, n, &ipq_hash[hash], list) {
                 if(qp->id == qp_in->id          &&
                    qp->saddr == qp_in->saddr    &&
                    qp->daddr == qp_in->daddr    &&
@@ -337,10 +327,7 @@ static struct ipq *ip_frag_intern(unsigned int hash, struct ipq *qp_in)
                 atomic_inc(&qp->refcnt);
 
         atomic_inc(&qp->refcnt);
-        if((qp->next = ipq_hash[hash]) != NULL)
-                qp->next->pprev = &qp->next;
-        ipq_hash[hash] = qp;
-        qp->pprev = &ipq_hash[hash];
+        hlist_add_head(&qp->list, &ipq_hash[hash]);
         INIT_LIST_HEAD(&qp->lru_list);
         list_add_tail(&qp->lru_list, &ipq_lru_list);
         ip_frag_nqueues++;
@@ -392,9 +379,10 @@ static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
         __u8 protocol = iph->protocol;
         unsigned int hash = ipqhashfn(id, saddr, daddr, protocol);
         struct ipq *qp;
+        struct hlist_node *n;
 
         read_lock(&ipfrag_lock);
-        for(qp = ipq_hash[hash]; qp; qp = qp->next) {
+        hlist_for_each_entry(qp, n, &ipq_hash[hash], list) {
                 if(qp->id == id         &&
                    qp->saddr == saddr   &&
                    qp->daddr == daddr   &&
diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c
index d77d6b3f5f80..59e12b02b22c 100644
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
@@ -29,9 +29,9 @@ static char *ftp_buffer;
 static DEFINE_SPINLOCK(ip_ftp_lock);
 
 #define MAX_PORTS 8
-static short ports[MAX_PORTS];
+static unsigned short ports[MAX_PORTS];
 static int ports_c;
-module_param_array(ports, short, &ports_c, 0400);
+module_param_array(ports, ushort, &ports_c, 0400);
 
 static int loose;
 module_param(loose, int, 0600);
diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c
index 15457415a4f3..2dea1db14406 100644
--- a/net/ipv4/netfilter/ip_conntrack_irc.c
+++ b/net/ipv4/netfilter/ip_conntrack_irc.c
@@ -34,7 +34,7 @@
 #include <linux/moduleparam.h>
 
 #define MAX_PORTS 8
-static short ports[MAX_PORTS];
+static unsigned short ports[MAX_PORTS];
 static int ports_c;
 static int max_dcc_channels = 8;
 static unsigned int dcc_timeout = 300;
@@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(ip_nat_irc_hook);
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");
 MODULE_LICENSE("GPL");
-module_param_array(ports, short, &ports_c, 0400);
+module_param_array(ports, ushort, &ports_c, 0400);
 MODULE_PARM_DESC(ports, "port numbers of IRC servers");
 module_param(max_dcc_channels, int, 0400);
 MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per IRC session");
diff --git a/net/ipv4/netfilter/ip_conntrack_tftp.c b/net/ipv4/netfilter/ip_conntrack_tftp.c
index a78736b8525d..d3c5a371f993 100644
--- a/net/ipv4/netfilter/ip_conntrack_tftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -26,9 +26,9 @@ MODULE_DESCRIPTION("tftp connection tracking helper");
 MODULE_LICENSE("GPL");
 
 #define MAX_PORTS 8
-static short ports[MAX_PORTS];
+static unsigned short ports[MAX_PORTS];
 static int ports_c;
-module_param_array(ports, short, &ports_c, 0400);
+module_param_array(ports, ushort, &ports_c, 0400);
 MODULE_PARM_DESC(ports, "port numbers of tftp servers");
 
 #if 0
diff --git a/net/ipv4/tcp_highspeed.c b/net/ipv4/tcp_highspeed.c
index 82b3c189bd7d..63cf7e540847 100644
--- a/net/ipv4/tcp_highspeed.c
+++ b/net/ipv4/tcp_highspeed.c
@@ -111,7 +111,7 @@ static void hstcp_init(struct sock *sk)
 }
 
 static void hstcp_cong_avoid(struct sock *sk, u32 adk, u32 rtt,
-                             u32 in_flight, u32 pkts_acked)
+                             u32 in_flight, int data_acked)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct hstcp *ca = inet_csk_ca(sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 40a26b7157b4..bf2e23086bce 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -367,7 +367,7 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep)
                  * are stalled on filesystem I/O.
                  *
                  * Also, since we are only going for a minimum in the
-                 * non-timestamp case, we do not smoother things out
+                 * non-timestamp case, we do not smooth things out
                  * else with timestamps disabled convergence takes too
                  * long.
                  */
@@ -546,7 +546,7 @@ static void tcp_rtt_estimator(struct sock *sk, const __u32 mrtt)
          *
          * Funny. This algorithm seems to be very broken.
          * These formulae increase RTO, when it should be decreased, increase
-         * too slowly, when it should be increased fastly, decrease too fastly
+         * too slowly, when it should be increased quickly, decrease too quickly
          * etc. I guess in BSD RTO takes ONE value, so that it is absolutely
          * does not matter how to _calculate_ it. Seems, it was trap
          * that VJ failed to avoid. 8)