Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121685
b: refs/heads/master
c: fd3f8c4
h: refs/heads/master
i:
  121683: d731a50
v: v3
  • Loading branch information
Jianjun Kong authored and David S. Miller committed Nov 3, 2008
1 parent 4bbf033 commit a2c8b5e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c354e1246348e25c714e6b2973f3257183d06e2c
refs/heads/master: fd3f8c4cb632c28ef915a535617a0fcddcfe3f80
2 changes: 1 addition & 1 deletion trunk/net/ipv4/ip_fragment.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ struct ipfrag_skb_cb
int offset;
};

#define FRAG_CB(skb) ((struct ipfrag_skb_cb*)((skb)->cb))
#define FRAG_CB(skb) ((struct ipfrag_skb_cb *)((skb)->cb))

/* Describe an entry in the "incomplete datagrams" queue. */
struct ipq {
Expand Down
4 changes: 2 additions & 2 deletions trunk/net/ipv4/ip_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ static int ip_rcv_finish(struct sk_buff *skb)
struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id());
u32 idx = skb->dst->tclassid;
st[idx&0xFF].o_packets++;
st[idx&0xFF].o_bytes+=skb->len;
st[idx&0xFF].o_bytes += skb->len;
st[(idx>>16)&0xFF].i_packets++;
st[(idx>>16)&0xFF].i_bytes+=skb->len;
st[(idx>>16)&0xFF].i_bytes += skb->len;
}
#endif

Expand Down
4 changes: 2 additions & 2 deletions trunk/net/ipv4/tcp_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static int tcp_write_timeout(struct sock *sk)

static void tcp_delack_timer(unsigned long data)
{
struct sock *sk = (struct sock*)data;
struct sock *sk = (struct sock *)data;
struct tcp_sock *tp = tcp_sk(sk);
struct inet_connection_sock *icsk = inet_csk(sk);

Expand Down Expand Up @@ -396,7 +396,7 @@ out:;

static void tcp_write_timer(unsigned long data)
{
struct sock *sk = (struct sock*)data;
struct sock *sk = (struct sock *)data;
struct inet_connection_sock *icsk = inet_csk(sk);
int event;

Expand Down

0 comments on commit a2c8b5e

Please sign in to comment.