aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/Kconfig2
-rw-r--r--net/ipv4/ip_fragment.c2
-rw-r--r--net/ipv4/netfilter/nf_nat_core.c2
-rw-r--r--net/netfilter/ipvs/Kconfig1
-rw-r--r--net/sctp/endpointola.c2
5 files changed, 3 insertions, 6 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 1a8f93bd2d4f..335ca7abbd46 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -163,8 +163,6 @@ config IP_PNP_RARP
163 operating on your network. Read 163 operating on your network. Read
164 <file:Documentation/filesystems/nfs/nfsroot.txt> for details. 164 <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
165 165
166# not yet ready..
167# bool ' IP: ARP support' CONFIG_IP_PNP_ARP
168config NET_IPIP 166config NET_IPIP
169 tristate "IP: tunneling" 167 tristate "IP: tunneling"
170 select INET_TUNNEL 168 select INET_TUNNEL
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index fdaabf2f2b68..1f23a57aa9e6 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -392,7 +392,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
392 /* Is this the final fragment? */ 392 /* Is this the final fragment? */
393 if ((flags & IP_MF) == 0) { 393 if ((flags & IP_MF) == 0) {
394 /* If we already have some bits beyond end 394 /* If we already have some bits beyond end
395 * or have different end, the segment is corrrupted. 395 * or have different end, the segment is corrupted.
396 */ 396 */
397 if (end < qp->q.len || 397 if (end < qp->q.len ||
398 ((qp->q.last_in & INET_FRAG_LAST_IN) && end != qp->q.len)) 398 ((qp->q.last_in & INET_FRAG_LAST_IN) && end != qp->q.len))
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index acdd002bb540..a708933dc230 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -317,7 +317,7 @@ nf_nat_setup_info(struct nf_conn *ct,
317 srchash = hash_by_src(net, nf_ct_zone(ct), 317 srchash = hash_by_src(net, nf_ct_zone(ct),
318 &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); 318 &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
319 spin_lock_bh(&nf_nat_lock); 319 spin_lock_bh(&nf_nat_lock);
320 /* nf_conntrack_alter_reply might re-allocate exntension aera */ 320 /* nf_conntrack_alter_reply might re-allocate extension area */
321 nat = nfct_nat(ct); 321 nat = nfct_nat(ct);
322 nat->ct = ct; 322 nat->ct = ct;
323 hlist_add_head_rcu(&nat->bysource, 323 hlist_add_head_rcu(&nat->bysource,
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
index af4c0b8c5275..f9871385a65e 100644
--- a/net/netfilter/ipvs/Kconfig
+++ b/net/netfilter/ipvs/Kconfig
@@ -122,7 +122,6 @@ config IP_VS_RR
122 122
123config IP_VS_WRR 123config IP_VS_WRR
124 tristate "weighted round-robin scheduling" 124 tristate "weighted round-robin scheduling"
125 select GCD
126 ---help--- 125 ---help---
127 The weighted robin-robin scheduling algorithm directs network 126 The weighted robin-robin scheduling algorithm directs network
128 connections to different real servers based on server weights 127 connections to different real servers based on server weights
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index c8cc24e282c3..68a385d7c3bd 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -415,7 +415,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work)
415 sctp_subtype_t subtype; 415 sctp_subtype_t subtype;
416 sctp_state_t state; 416 sctp_state_t state;
417 int error = 0; 417 int error = 0;
418 int first_time = 1; /* is this the first time through the looop */ 418 int first_time = 1; /* is this the first time through the loop */
419 419
420 if (ep->base.dead) 420 if (ep->base.dead)
421 return; 421 return;