diff options
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 8c8e8112f98d..0ca8dead03b0 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -542,7 +542,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) | |||
542 | struct { | 542 | struct { |
543 | struct tcphdr th; | 543 | struct tcphdr th; |
544 | #ifdef CONFIG_TCP_MD5SIG | 544 | #ifdef CONFIG_TCP_MD5SIG |
545 | u32 opt[(TCPOLEN_MD5SIG_ALIGNED >> 2)]; | 545 | __be32 opt[(TCPOLEN_MD5SIG_ALIGNED >> 2)]; |
546 | #endif | 546 | #endif |
547 | } rep; | 547 | } rep; |
548 | struct ip_reply_arg arg; | 548 | struct ip_reply_arg arg; |
@@ -618,9 +618,9 @@ static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk, | |||
618 | struct tcphdr *th = skb->h.th; | 618 | struct tcphdr *th = skb->h.th; |
619 | struct { | 619 | struct { |
620 | struct tcphdr th; | 620 | struct tcphdr th; |
621 | u32 opt[(TCPOLEN_TSTAMP_ALIGNED >> 2) | 621 | __be32 opt[(TCPOLEN_TSTAMP_ALIGNED >> 2) |
622 | #ifdef CONFIG_TCP_MD5SIG | 622 | #ifdef CONFIG_TCP_MD5SIG |
623 | + (TCPOLEN_MD5SIG_ALIGNED >> 2) | 623 | + (TCPOLEN_MD5SIG_ALIGNED >> 2) |
624 | #endif | 624 | #endif |
625 | ]; | 625 | ]; |
626 | } rep; | 626 | } rep; |
@@ -2333,8 +2333,8 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i) | |||
2333 | struct tcp_sock *tp = tcp_sk(sp); | 2333 | struct tcp_sock *tp = tcp_sk(sp); |
2334 | const struct inet_connection_sock *icsk = inet_csk(sp); | 2334 | const struct inet_connection_sock *icsk = inet_csk(sp); |
2335 | struct inet_sock *inet = inet_sk(sp); | 2335 | struct inet_sock *inet = inet_sk(sp); |
2336 | unsigned int dest = inet->daddr; | 2336 | __be32 dest = inet->daddr; |
2337 | unsigned int src = inet->rcv_saddr; | 2337 | __be32 src = inet->rcv_saddr; |
2338 | __u16 destp = ntohs(inet->dport); | 2338 | __u16 destp = ntohs(inet->dport); |
2339 | __u16 srcp = ntohs(inet->sport); | 2339 | __u16 srcp = ntohs(inet->sport); |
2340 | 2340 | ||