Merge bk://kernel.bkbits.net/acme/net-headers-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

include/linux/divert.h

@@ -109,6 +109,8 @@ struct divert_cf
 #include <linux/skbuff.h>
 
 #ifdef CONFIG_NET_DIVERT
+#include <linux/netdevice.h>
+
 int alloc_divert_blk(struct net_device *);
 void free_divert_blk(struct net_device *);
 int divert_ioctl(unsigned int cmd, struct divert_cf __user *arg);

include/linux/filter.h

@@ -6,6 +6,9 @@
 #define __LINUX_FILTER_H__
 
 #include <linux/compiler.h>
+#include <linux/types.h>
+
+#include <asm/atomic.h>
 
 /*
  * Current version of the filter code architecture.
@@ -135,6 +138,9 @@ static inline unsigned int sk_filter_len(struct sk_filter *fp)
 #define SKF_LL_OFF    (-0x200000)
 
 #ifdef __KERNEL__
+struct sk_buff;
+struct sock;
+
 extern 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);

include/linux/icmp.h

@@ -17,6 +17,8 @@
 #ifndef _LINUX_ICMP_H
 #define	_LINUX_ICMP_H
 
+#include <linux/types.h>
+
 #define ICMP_ECHOREPLY		0	/* Echo Reply			*/
 #define ICMP_DEST_UNREACH	3	/* Destination Unreachable	*/
 #define ICMP_SOURCE_QUENCH	4	/* Source Quench		*/

include/linux/inet.h

@@ -43,6 +43,8 @@
 #define _LINUX_INET_H
 
 #ifdef __KERNEL__
+#include <linux/types.h>
+
 extern __u32 in_aton(const char *str);
 #endif
 #endif	/* _LINUX_INET_H */

include/linux/inetdevice.h

@@ -3,7 +3,10 @@
 
 #ifdef __KERNEL__
 
+#include <linux/if.h>
+#include <linux/netdevice.h>
 #include <linux/rcupdate.h>
+#include <linux/timer.h>
 
 struct ipv4_devconf
 {

include/net/iw_handler.h

@@ -198,6 +198,7 @@
 /***************************** INCLUDES *****************************/
 
 #include <linux/wireless.h>		/* IOCTL user space API */
+#include <linux/if_ether.h>
 
 /***************************** VERSION *****************************/
 /*
@@ -294,6 +295,8 @@ struct iw_request_info
 	__u16		flags;		/* More to come ;-) */
 };
 
+struct net_device;
+
 /*
  * This is how a function handling a Wireless Extension should look
  * like (both get and set, standard and private).