diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
| commit | 572e432e01c1f7c64ad8375a6e0d935b0e40ebf5 (patch) | |
| tree | 57ae4168e9bf4c88a1267f4ec6c96df3789cc9cc /net/ipv4/raw.c | |
| parent | d11ea48aab3b57cc931cc7120603e1c2ffb04302 (diff) | |
| parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/ipv4/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index bd221ec3f81e..62b2762a2420 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -609,6 +609,7 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
| 609 | if (sin) { | 609 | if (sin) { |
| 610 | sin->sin_family = AF_INET; | 610 | sin->sin_family = AF_INET; |
| 611 | sin->sin_addr.s_addr = skb->nh.iph->saddr; | 611 | sin->sin_addr.s_addr = skb->nh.iph->saddr; |
| 612 | sin->sin_port = 0; | ||
| 612 | memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); | 613 | memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); |
| 613 | } | 614 | } |
| 614 | if (inet->cmsg_flags) | 615 | if (inet->cmsg_flags) |