diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/af_inet.c | 2 | ||||
-rw-r--r-- | net/ipv4/icmp.c | 2 | ||||
-rw-r--r-- | net/ipv4/ip_options.c | 2 | ||||
-rw-r--r-- | net/ipv4/ip_output.c | 4 | ||||
-rw-r--r-- | net/ipv4/raw.c | 2 | ||||
-rw-r--r-- | net/ipv4/udp.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index ea5844832683..edcf0932ac6d 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1043,7 +1043,7 @@ int inet_sk_rebuild_header(struct sock *sk) | |||
1043 | { | 1043 | { |
1044 | struct inet_sock *inet = inet_sk(sk); | 1044 | struct inet_sock *inet = inet_sk(sk); |
1045 | struct rtable *rt = (struct rtable *)__sk_dst_check(sk, 0); | 1045 | struct rtable *rt = (struct rtable *)__sk_dst_check(sk, 0); |
1046 | u32 daddr; | 1046 | __be32 daddr; |
1047 | int err; | 1047 | int err; |
1048 | 1048 | ||
1049 | /* Route is OK, nothing to do. */ | 1049 | /* Route is OK, nothing to do. */ |
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 45396c53560d..2afa619d17eb 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -381,7 +381,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) | |||
381 | struct inet_sock *inet = inet_sk(sk); | 381 | struct inet_sock *inet = inet_sk(sk); |
382 | struct ipcm_cookie ipc; | 382 | struct ipcm_cookie ipc; |
383 | struct rtable *rt = (struct rtable *)skb->dst; | 383 | struct rtable *rt = (struct rtable *)skb->dst; |
384 | u32 daddr; | 384 | __be32 daddr; |
385 | 385 | ||
386 | if (ip_options_echo(&icmp_param->replyopts, skb)) | 386 | if (ip_options_echo(&icmp_param->replyopts, skb)) |
387 | return; | 387 | return; |
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 889e14180b04..3e6d3d4e50d4 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c | |||
@@ -165,7 +165,7 @@ int ip_options_echo(struct ip_options * dopt, struct sk_buff * skb) | |||
165 | } | 165 | } |
166 | if (sopt->srr) { | 166 | if (sopt->srr) { |
167 | unsigned char * start = sptr+sopt->srr; | 167 | unsigned char * start = sptr+sopt->srr; |
168 | u32 faddr; | 168 | __be32 faddr; |
169 | 169 | ||
170 | optlen = start[1]; | 170 | optlen = start[1]; |
171 | soffset = start[2]; | 171 | soffset = start[2]; |
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 5bf2f094e317..fc195a44fc2e 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
@@ -306,7 +306,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok) | |||
306 | /* Make sure we can route this packet. */ | 306 | /* Make sure we can route this packet. */ |
307 | rt = (struct rtable *)__sk_dst_check(sk, 0); | 307 | rt = (struct rtable *)__sk_dst_check(sk, 0); |
308 | if (rt == NULL) { | 308 | if (rt == NULL) { |
309 | u32 daddr; | 309 | __be32 daddr; |
310 | 310 | ||
311 | /* Use correct destination address if we have options. */ | 311 | /* Use correct destination address if we have options. */ |
312 | daddr = inet->daddr; | 312 | daddr = inet->daddr; |
@@ -1340,7 +1340,7 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar | |||
1340 | char data[40]; | 1340 | char data[40]; |
1341 | } replyopts; | 1341 | } replyopts; |
1342 | struct ipcm_cookie ipc; | 1342 | struct ipcm_cookie ipc; |
1343 | u32 daddr; | 1343 | __be32 daddr; |
1344 | struct rtable *rt = (struct rtable*)skb->dst; | 1344 | struct rtable *rt = (struct rtable*)skb->dst; |
1345 | 1345 | ||
1346 | if (ip_options_echo(&replyopts.opt, skb)) | 1346 | if (ip_options_echo(&replyopts.opt, skb)) |
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 0e935b4c8741..49e5b4b55b93 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
@@ -381,7 +381,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
381 | struct ipcm_cookie ipc; | 381 | struct ipcm_cookie ipc; |
382 | struct rtable *rt = NULL; | 382 | struct rtable *rt = NULL; |
383 | int free = 0; | 383 | int free = 0; |
384 | u32 daddr; | 384 | __be32 daddr; |
385 | u32 saddr; | 385 | u32 saddr; |
386 | u8 tos; | 386 | u8 tos; |
387 | int err; | 387 | int err; |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 77e265d7bb8f..b63fd3d39024 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -513,7 +513,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
513 | struct rtable *rt = NULL; | 513 | struct rtable *rt = NULL; |
514 | int free = 0; | 514 | int free = 0; |
515 | int connected = 0; | 515 | int connected = 0; |
516 | u32 daddr, faddr, saddr; | 516 | __be32 daddr, faddr, saddr; |
517 | u16 dport; | 517 | u16 dport; |
518 | u8 tos; | 518 | u8 tos; |
519 | int err; | 519 | int err; |