forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source
This commit is contained in:
Linus Torvalds 2006-01-06 15:24:28 -08:00
commit d8d8f6a4fd
20 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/filter.h
View file

@ -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__ */

2
include/linux/inet.h
View file

@ -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 */

10
include/linux/ip.h
View file

@ -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. */
};