diff options
author | Jianjun Kong <jianjun@zeuux.org> | 2008-11-03 05:47:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-03 05:47:38 -0500 |
commit | fd3f8c4cb632c28ef915a535617a0fcddcfe3f80 (patch) | |
tree | 95cd83e4207b5ccd8542676838cbb0b19c394129 /net/ipv4 | |
parent | c354e1246348e25c714e6b2973f3257183d06e2c (diff) |
net: clean up net/ipv4/ip_fragment.c tcp_timer.c ip_input.c
Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ip_fragment.c | 2 | ||||
-rw-r--r-- | net/ipv4/ip_input.c | 4 | ||||
-rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 8c495e34d563..1a3c37b5e936 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -56,7 +56,7 @@ struct ipfrag_skb_cb | |||
56 | int offset; | 56 | int offset; |
57 | }; | 57 | }; |
58 | 58 | ||
59 | #define FRAG_CB(skb) ((struct ipfrag_skb_cb*)((skb)->cb)) | 59 | #define FRAG_CB(skb) ((struct ipfrag_skb_cb *)((skb)->cb)) |
60 | 60 | ||
61 | /* Describe an entry in the "incomplete datagrams" queue. */ | 61 | /* Describe an entry in the "incomplete datagrams" queue. */ |
62 | struct ipq { | 62 | struct ipq { |
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 1b6475c05eb4..70bedab03b09 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c | |||
@@ -340,9 +340,9 @@ static int ip_rcv_finish(struct sk_buff *skb) | |||
340 | struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id()); | 340 | struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id()); |
341 | u32 idx = skb->dst->tclassid; | 341 | u32 idx = skb->dst->tclassid; |
342 | st[idx&0xFF].o_packets++; | 342 | st[idx&0xFF].o_packets++; |
343 | st[idx&0xFF].o_bytes+=skb->len; | 343 | st[idx&0xFF].o_bytes += skb->len; |
344 | st[(idx>>16)&0xFF].i_packets++; | 344 | st[(idx>>16)&0xFF].i_packets++; |
345 | st[(idx>>16)&0xFF].i_bytes+=skb->len; | 345 | st[(idx>>16)&0xFF].i_bytes += skb->len; |
346 | } | 346 | } |
347 | #endif | 347 | #endif |
348 | 348 | ||
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 9843f6cb40a5..3df339e3e363 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -171,7 +171,7 @@ static int tcp_write_timeout(struct sock *sk) | |||
171 | 171 | ||
172 | static void tcp_delack_timer(unsigned long data) | 172 | static void tcp_delack_timer(unsigned long data) |
173 | { | 173 | { |
174 | struct sock *sk = (struct sock*)data; | 174 | struct sock *sk = (struct sock *)data; |
175 | struct tcp_sock *tp = tcp_sk(sk); | 175 | struct tcp_sock *tp = tcp_sk(sk); |
176 | struct inet_connection_sock *icsk = inet_csk(sk); | 176 | struct inet_connection_sock *icsk = inet_csk(sk); |
177 | 177 | ||
@@ -396,7 +396,7 @@ out:; | |||
396 | 396 | ||
397 | static void tcp_write_timer(unsigned long data) | 397 | static void tcp_write_timer(unsigned long data) |
398 | { | 398 | { |
399 | struct sock *sk = (struct sock*)data; | 399 | struct sock *sk = (struct sock *)data; |
400 | struct inet_connection_sock *icsk = inet_csk(sk); | 400 | struct inet_connection_sock *icsk = inet_csk(sk); |
401 | int event; | 401 | int event; |
402 | 402 | ||