Skip to content

Commit

Permalink
tcpv6: trivial formatting changes to send_(ack|reset)
Browse files Browse the repository at this point in the history
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ilpo Järvinen authored and David S. Miller committed Oct 9, 2008
1 parent 78e645c commit 77c676d
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/ipv6/tcp_ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
struct flowi fl;
struct net *net = dev_net(skb->dst->dev);
struct sock *ctl_sk = net->ipv6.tcp_sk;
unsigned int tot_len = sizeof(*th);
unsigned int tot_len = sizeof(struct tcphdr);
#ifdef CONFIG_TCP_MD5SIG
struct tcp_md5sig_key *key;
#endif
Expand Down Expand Up @@ -1033,7 +1033,6 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
* namespace
*/
if (!ip6_dst_lookup(ctl_sk, &buff->dst, &fl)) {

if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
ip6_xmit(ctl_sk, buff, &fl, NULL, 0);
TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
Expand Down Expand Up @@ -1070,13 +1069,13 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32

skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);

t1 = (struct tcphdr *) skb_push(buff,tot_len);
t1 = (struct tcphdr *) skb_push(buff, tot_len);

/* Swap the send and the receive. */
memset(t1, 0, sizeof(*t1));
t1->dest = th->source;
t1->source = th->dest;
t1->doff = tot_len/4;
t1->doff = tot_len / 4;
t1->seq = htonl(seq);
t1->ack_seq = htonl(ack);
t1->ack = 1;
Expand Down

0 comments on commit 77c676d

Please sign in to comment.