diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /include/net/raw.h | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/net/raw.h')
| -rw-r--r-- | include/net/raw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/raw.h b/include/net/raw.h index e67b28a0248c..d83571fe4c69 100644 --- a/include/net/raw.h +++ b/include/net/raw.h | |||
| @@ -36,7 +36,7 @@ extern rwlock_t raw_v4_lock; | |||
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, | 38 | extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, |
| 39 | unsigned long raddr, unsigned long laddr, | 39 | __be32 raddr, __be32 laddr, |
| 40 | int dif); | 40 | int dif); |
| 41 | 41 | ||
| 42 | extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash); | 42 | extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash); |