lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: clean up net/ipv4/ipip.c raw.c tcp.c tcp_minisocks.c tcp_yeah.c xfrm4_policy.c

Browse Source 
Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jianjun Kong
2008-11-03 00:24:34 -08:00
committed by David S. Miller
parent d9319100c1
commit 5a5f3a8db9
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/ipip.c
View File

@@ -281,7 +281,7 @@ static int ipip_err(struct sk_buff *skb, u32 info)
8 bytes of packet payload. It means, that precise relaying of 8 bytes of packet payload. It means, that precise relaying of
ICMP in the real Internet is absolutely infeasible. ICMP in the real Internet is absolutely infeasible.
*/ */
struct iphdr *iph = (struct iphdr*)skb->data; struct iphdr *iph = (struct iphdr *)skb->data;
const int type = icmp_hdr(skb)->type; const int type = icmp_hdr(skb)->type;
const int code = icmp_hdr(skb)->code; const int code = icmp_hdr(skb)->code;
struct ip_tunnel *t; struct ip_tunnel *t;

8
net/ipv4/raw.c
View File

@@ -247,7 +247,7 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info)
} }
if (inet->recverr) { if (inet->recverr) {
struct iphdr *iph = (struct iphdr*)skb->data; struct iphdr *iph = (struct iphdr *)skb->data;
u8 *payload = skb->data + (iph->ihl << 2); u8 *payload = skb->data + (iph->ihl << 2);
if (inet->hdrincl) if (inet->hdrincl)
@@ -465,7 +465,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
*/ */
if (msg->msg_namelen) { if (msg->msg_namelen) {
struct sockaddr_in *usin = (struct sockaddr_in*)msg->msg_name; struct sockaddr_in *usin = (struct sockaddr_in *)msg->msg_name;
err = -EINVAL; err = -EINVAL;
if (msg->msg_namelen < sizeof(*usin)) if (msg->msg_namelen < sizeof(*usin))
goto out; goto out;
@@ -851,7 +851,7 @@ struct proto raw_prot = {
static struct sock *raw_get_first(struct seq_file *seq) static struct sock *raw_get_first(struct seq_file *seq)
{ {
struct sock *sk; struct sock *sk;
struct raw_iter_state* state = raw_seq_private(seq); struct raw_iter_state *state = raw_seq_private(seq);
for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE; for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
++state->bucket) { ++state->bucket) {
@@ -868,7 +868,7 @@ found:
static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk) static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
{ {
struct raw_iter_state* state = raw_seq_private(seq); struct raw_iter_state *state = raw_seq_private(seq);
do { do {
sk = sk_next(sk); sk = sk_next(sk);

6
net/ipv4/tcp.c
View File

@@ -1681,7 +1681,7 @@ void tcp_set_state(struct sock *sk, int state)
inet_put_port(sk); inet_put_port(sk);
/* fall through */ /* fall through */
default: default:
if (oldstate==TCP_ESTABLISHED) if (oldstate == TCP_ESTABLISHED)
TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB); TCP_DEC_STATS(sock_net(sk), TCP_MIB_CURRESTAB);
} }
@@ -1691,7 +1691,7 @@ void tcp_set_state(struct sock *sk, int state)
sk->sk_state = state; sk->sk_state = state;
#ifdef STATE_TRACE #ifdef STATE_TRACE
SOCK_DEBUG(sk, "TCP sk=%p, State %s -> %s\n",sk, statename[oldstate],statename[state]); SOCK_DEBUG(sk, "TCP sk=%p, State %s -> %s\n", sk, statename[oldstate], statename[state]);
#endif #endif
} }
EXPORT_SYMBOL_GPL(tcp_set_state); EXPORT_SYMBOL_GPL(tcp_set_state);
@@ -2651,7 +2651,7 @@ EXPORT_SYMBOL(tcp_md5_hash_key);
void tcp_done(struct sock *sk) void tcp_done(struct sock *sk)
{ {
if(sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV) if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)
TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS); TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
tcp_set_state(sk, TCP_CLOSE); tcp_set_state(sk, TCP_CLOSE);

2
net/ipv4/tcp_minisocks.c
View File

@@ -491,7 +491,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
* as a request_sock. * as a request_sock.
*/ */
struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,
struct request_sock *req, struct request_sock *req,
struct request_sock **prev) struct request_sock **prev)
{ {

4
net/ipv4/tcp_yeah.c
View File

@@ -83,7 +83,7 @@ static void tcp_yeah_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
else if (!yeah->doing_reno_now) { else if (!yeah->doing_reno_now) {
/* Scalable */ /* Scalable */
tp->snd_cwnd_cnt+=yeah->pkts_acked; tp->snd_cwnd_cnt += yeah->pkts_acked;
if (tp->snd_cwnd_cnt > min(tp->snd_cwnd, TCP_SCALABLE_AI_CNT)){ if (tp->snd_cwnd_cnt > min(tp->snd_cwnd, TCP_SCALABLE_AI_CNT)){
if (tp->snd_cwnd < tp->snd_cwnd_clamp) if (tp->snd_cwnd < tp->snd_cwnd_clamp)
tp->snd_cwnd++; tp->snd_cwnd++;
@@ -224,7 +224,7 @@ static u32 tcp_yeah_ssthresh(struct sock *sk) {
reduction = max( reduction, tp->snd_cwnd >> TCP_YEAH_DELTA); reduction = max( reduction, tp->snd_cwnd >> TCP_YEAH_DELTA);
} else } else
reduction = max(tp->snd_cwnd>>1,2U); reduction = max(tp->snd_cwnd>>1, 2U);
yeah->fast_count = 0; yeah->fast_count = 0;
yeah->reno_count = max(yeah->reno_count>>1, 2U); yeah->reno_count = max(yeah->reno_count>>1, 2U);

2
net/ipv4/xfrm4_policy.c
View File

@@ -65,7 +65,7 @@ __xfrm4_find_bundle(struct flowi *fl, struct xfrm_policy *policy)
read_lock_bh(&policy->lock); read_lock_bh(&policy->lock);
for (dst = policy->bundles; dst; dst = dst->next) { for (dst = policy->bundles; dst; dst = dst->next) {
struct xfrm_dst *xdst = (struct xfrm_dst*)dst; struct xfrm_dst *xdst = (struct xfrm_dst *)dst;
if (xdst->u.rt.fl.oif == fl->oif && /*XXX*/ if (xdst->u.rt.fl.oif == fl->oif && /*XXX*/
xdst->u.rt.fl.fl4_dst == fl->fl4_dst && xdst->u.rt.fl.fl4_dst == fl->fl4_dst &&
xdst->u.rt.fl.fl4_src == fl->fl4_src && xdst->u.rt.fl.fl4_src == fl->fl4_src &&