git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
ipv4
/
raw.c
diff --git
a/net/ipv4/raw.c
b/net/ipv4/raw.c
index
a4db06c
..
c9caff2
100644
(file)
--- a/
net/ipv4/raw.c
+++ b/
net/ipv4/raw.c
@@
-38,8
+38,7
@@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
-
-#include <linux/config.h>
+
#include <linux/types.h>
#include <asm/atomic.h>
#include <asm/byteorder.h>
#include <linux/types.h>
#include <asm/atomic.h>
#include <asm/byteorder.h>
@@
-124,7
+123,7
@@
static inline int raw_addr_match (
}
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
}
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
-
unsigned long raddr, unsigned long
laddr,
+
__be32 raddr, __be32
laddr,
int dif)
{
struct hlist_node *node;
int dif)
{
struct hlist_node *node;
@@
-643,6
+642,7
@@
static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
if (sin) {
sin->sin_family = AF_INET;
sin->sin_addr.s_addr = skb->nh.iph->saddr;
if (sin) {
sin->sin_family = AF_INET;
sin->sin_addr.s_addr = skb->nh.iph->saddr;
+ sin->sin_port = 0;
memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
}
if (inet->cmsg_flags)
memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
}
if (inet->cmsg_flags)