diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 02:13:18 -0400 |
| commit | 2c10c22af088ab5d94fae93ce3fe6436b2a208b4 (patch) | |
| tree | db27721001f194327ddbdcd6c983c4ec68b77c00 /net/ipv6/tcp_ipv6.c | |
| parent | f6121f4f8708195e88cbdf8dd8d171b226b3f858 (diff) | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index b585c850a89a..10e22fd48222 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1050,7 +1050,7 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32 | |||
| 1050 | struct tcphdr *th = tcp_hdr(skb), *t1; | 1050 | struct tcphdr *th = tcp_hdr(skb), *t1; |
| 1051 | struct sk_buff *buff; | 1051 | struct sk_buff *buff; |
| 1052 | struct flowi fl; | 1052 | struct flowi fl; |
| 1053 | struct net *net = dev_net(skb->dev); | 1053 | struct net *net = dev_net(skb->dst->dev); |
| 1054 | struct sock *ctl_sk = net->ipv6.tcp_sk; | 1054 | struct sock *ctl_sk = net->ipv6.tcp_sk; |
| 1055 | unsigned int tot_len = sizeof(struct tcphdr); | 1055 | unsigned int tot_len = sizeof(struct tcphdr); |
| 1056 | __be32 *topt; | 1056 | __be32 *topt; |