diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2010-04-15 12:43:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-16 02:36:37 -0400 |
commit | 4e15ed4d930297c127d280ca1d0c785be870def4 (patch) | |
tree | e0808d650ae66cf273758496100d3d24739a9e48 /net/ipv6/tcp_ipv6.c | |
parent | 0eecb784942792863b77dfe11e0c7e286e92db85 (diff) |
net: replace ipfragok with skb->local_df
As Herbert Xu said: we should be able to simply replace ipfragok
with skb->local_df. commit f88037(sctp: Drop ipfargok in sctp_xmit function)
has droped ipfragok and set local_df value properly.
The patch kills the ipfragok parameter of .queue_xmit().
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index b429dfdd69dc..bd5ef7b6e48e 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -509,7 +509,7 @@ static int tcp_v6_send_synack(struct sock *sk, struct request_sock *req, | |||
509 | __tcp_v6_send_check(skb, &treq->loc_addr, &treq->rmt_addr); | 509 | __tcp_v6_send_check(skb, &treq->loc_addr, &treq->rmt_addr); |
510 | 510 | ||
511 | ipv6_addr_copy(&fl.fl6_dst, &treq->rmt_addr); | 511 | ipv6_addr_copy(&fl.fl6_dst, &treq->rmt_addr); |
512 | err = ip6_xmit(sk, skb, &fl, opt, 0); | 512 | err = ip6_xmit(sk, skb, &fl, opt); |
513 | err = net_xmit_eval(err); | 513 | err = net_xmit_eval(err); |
514 | } | 514 | } |
515 | 515 | ||
@@ -1071,7 +1071,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win, | |||
1071 | if (!ip6_dst_lookup(ctl_sk, &dst, &fl)) { | 1071 | if (!ip6_dst_lookup(ctl_sk, &dst, &fl)) { |
1072 | if (xfrm_lookup(net, &dst, &fl, NULL, 0) >= 0) { | 1072 | if (xfrm_lookup(net, &dst, &fl, NULL, 0) >= 0) { |
1073 | skb_dst_set(buff, dst); | 1073 | skb_dst_set(buff, dst); |
1074 | ip6_xmit(ctl_sk, buff, &fl, NULL, 0); | 1074 | ip6_xmit(ctl_sk, buff, &fl, NULL); |
1075 | TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS); | 1075 | TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS); |
1076 | if (rst) | 1076 | if (rst) |
1077 | TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS); | 1077 | TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS); |