diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 2 | ||||
-rw-r--r-- | net/netfilter/ipvs/ip_vs_lblc.c | 2 | ||||
-rw-r--r-- | net/netfilter/ipvs/ip_vs_lblcr.c | 2 | ||||
-rw-r--r-- | net/sctp/associola.c | 2 | ||||
-rw-r--r-- | net/sctp/protocol.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 098a050a20b0..13ef5bc05cf5 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -199,7 +199,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb, | |||
199 | int offset, end; | 199 | int offset, end; |
200 | 200 | ||
201 | if (fq->q.last_in & INET_FRAG_COMPLETE) { | 201 | if (fq->q.last_in & INET_FRAG_COMPLETE) { |
202 | pr_debug("Allready completed\n"); | 202 | pr_debug("Already completed\n"); |
203 | goto err; | 203 | goto err; |
204 | } | 204 | } |
205 | 205 | ||
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c index 94a45213faa6..9323f8944199 100644 --- a/net/netfilter/ipvs/ip_vs_lblc.c +++ b/net/netfilter/ipvs/ip_vs_lblc.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * Changes: | 11 | * Changes: |
12 | * Martin Hamilton : fixed the terrible locking bugs | 12 | * Martin Hamilton : fixed the terrible locking bugs |
13 | * *lock(tbl->lock) ==> *lock(&tbl->lock) | 13 | * *lock(tbl->lock) ==> *lock(&tbl->lock) |
14 | * Wensong Zhang : fixed the uninitilized tbl->lock bug | 14 | * Wensong Zhang : fixed the uninitialized tbl->lock bug |
15 | * Wensong Zhang : added doing full expiration check to | 15 | * Wensong Zhang : added doing full expiration check to |
16 | * collect stale entries of 24+ hours when | 16 | * collect stale entries of 24+ hours when |
17 | * no partial expire check in a half hour | 17 | * no partial expire check in a half hour |
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c index 535dc2b419d8..dbeed8ea421a 100644 --- a/net/netfilter/ipvs/ip_vs_lblcr.c +++ b/net/netfilter/ipvs/ip_vs_lblcr.c | |||
@@ -386,7 +386,7 @@ ip_vs_lblcr_new(struct ip_vs_lblcr_table *tbl, const union nf_inet_addr *daddr, | |||
386 | ip_vs_addr_copy(dest->af, &en->addr, daddr); | 386 | ip_vs_addr_copy(dest->af, &en->addr, daddr); |
387 | en->lastuse = jiffies; | 387 | en->lastuse = jiffies; |
388 | 388 | ||
389 | /* initilize its dest set */ | 389 | /* initialize its dest set */ |
390 | atomic_set(&(en->set.size), 0); | 390 | atomic_set(&(en->set.size), 0); |
391 | INIT_LIST_HEAD(&en->set.list); | 391 | INIT_LIST_HEAD(&en->set.list); |
392 | rwlock_init(&en->set.lock); | 392 | rwlock_init(&en->set.lock); |
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index e41feff19e43..0b85e5256434 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
@@ -172,7 +172,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a | |||
172 | asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] = | 172 | asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] = |
173 | (unsigned long)sp->autoclose * HZ; | 173 | (unsigned long)sp->autoclose * HZ; |
174 | 174 | ||
175 | /* Initilizes the timers */ | 175 | /* Initializes the timers */ |
176 | for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) | 176 | for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) |
177 | setup_timer(&asoc->timers[i], sctp_timer_events[i], | 177 | setup_timer(&asoc->timers[i], sctp_timer_events[i], |
178 | (unsigned long)asoc); | 178 | (unsigned long)asoc); |
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index c0e162aeb0bd..5027b83f1cc0 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -1163,7 +1163,7 @@ SCTP_STATIC __init int sctp_init(void) | |||
1163 | /* Set the pressure threshold to be a fraction of global memory that | 1163 | /* Set the pressure threshold to be a fraction of global memory that |
1164 | * is up to 1/2 at 256 MB, decreasing toward zero with the amount of | 1164 | * is up to 1/2 at 256 MB, decreasing toward zero with the amount of |
1165 | * memory, with a floor of 128 pages. | 1165 | * memory, with a floor of 128 pages. |
1166 | * Note this initalizes the data in sctpv6_prot too | 1166 | * Note this initializes the data in sctpv6_prot too |
1167 | * Unabashedly stolen from tcp_init | 1167 | * Unabashedly stolen from tcp_init |
1168 | */ | 1168 | */ |
1169 | nr_pages = totalram_pages - totalhigh_pages; | 1169 | nr_pages = totalram_pages - totalhigh_pages; |