diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:24:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:24:28 -0800 |
| commit | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (patch) | |
| tree | 0a1bc8ff40c12bb30066467e11ae9153f89514e7 /include | |
| parent | 57d1c91fa6d9146b309b7511f6432dea2a24858b (diff) | |
| parent | a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c (diff) | |
| download | linux-3.10-d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66.tar.gz linux-3.10-d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66.tar.bz2 linux-3.10-d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filter.h | 2 | ||||
| -rw-r--r-- | include/linux/inet.h | 2 | ||||
| -rw-r--r-- | include/linux/ip.h | 10 | ||||
| -rw-r--r-- | include/net/sock.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 3ba843c4638..c6cb8f09508 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -143,7 +143,7 @@ static inline unsigned int sk_filter_len(struct sk_filter *fp) struct sk_buff; struct sock; -extern int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen); +extern unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen); extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk); extern int sk_chk_filter(struct sock_filter *filter, int flen); #endif /* __KERNEL__ */ diff --git a/include/linux/inet.h b/include/linux/inet.h index 3b5e9fdff87..6c5587af118 100644 --- a/include/linux/inet.h +++ b/include/linux/inet.h @@ -45,6 +45,6 @@ #ifdef __KERNEL__ #include <linux/types.h> -extern __u32 in_aton(const char *str); +extern __be32 in_aton(const char *str); #endif #endif /* _LINUX_INET_H */ diff --git a/include/linux/ip.h b/include/linux/ip.h index 9e2eb9a602e..4b55cf1df73 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h @@ -90,14 +90,14 @@ struct iphdr { #error "Please fix <asm/byteorder.h>" #endif __u8 tos; - __u16 tot_len; - __u16 id; - __u16 frag_off; + __be16 tot_len; + __be16 id; + __be16 frag_off; __u8 ttl; __u8 protocol; __u16 check; - __u32 saddr; - __u32 daddr; + __be32 saddr; + __be32 daddr; /*The options start here. */ }; diff --git a/include/net/sock.h b/include/net/sock.h index 6961700ff3a..1806e5b6141 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -856,8 +856,8 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock) filter = sk->sk_filter; if (filter) { - int pkt_len = sk_run_filter(skb, filter->insns, - filter->len); + unsigned int pkt_len = sk_run_filter(skb, filter->insns, + filter->len); if (!pkt_len) err = -EPERM; else |