Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5

into kernel.bkbits.net:/home/davem/net-2.5

6 files changed, 26 insertions, 35 deletions

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 503c72da8c47..da2eaeb18118 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -213,24 +213,6 @@ extern void tasklet_kill(struct tasklet_struct *t);
 extern void tasklet_init(struct tasklet_struct *t,
 			 void (*func)(unsigned long), unsigned long data);
 
-#ifdef CONFIG_SMP
-
-#define SMP_TIMER_NAME(name) name##__thr
-
-#define SMP_TIMER_DEFINE(name, task) \
-DECLARE_TASKLET(task, name##__thr, 0); \
-static void name (unsigned long dummy) \
-{ \
-	tasklet_schedule(&(task)); \
-}
-
-#else /* CONFIG_SMP */
-
-#define SMP_TIMER_NAME(name) name
-#define SMP_TIMER_DEFINE(name, task)
-
-#endif /* CONFIG_SMP */
-
 /*
  * Autoprobing for irqs:
  *
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 7106c2eaf67e..e445c167c919 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -441,9 +441,6 @@ struct net_device
 	struct divert_blk	*divert;
 #endif /* CONFIG_NET_DIVERT */
 
-	/* generic device structure used in constructing class */
-	struct device		*dev;
-
 	/* class/net/name entry */
 	struct class_device	class_dev;
 
@@ -455,7 +452,7 @@ struct net_device
 /* Set the sysfs physical device reference for the network logical device
  * if set prior to registration will cause a symlink during initialization.
  */
-#define SET_NETDEV_DEV(net, pdev)	((net)->dev = (pdev))
+#define SET_NETDEV_DEV(net, pdev)	((net)->class_dev.dev = (pdev))
 
 
 struct packet_type 
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 1dc2e0d5ce5e..44daac8cde2a 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -7,6 +7,7 @@
 #include <linux/config.h>
 #include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
 #include <linux/bitops.h>
+#include <linux/compiler.h>
 #include <asm/atomic.h>
 
 enum ip_conntrack_info
@@ -266,5 +267,16 @@ static inline int is_confirmed(struct ip_conntrack *ct)
 }
 
 extern unsigned int ip_conntrack_htable_size;
+
+/* eg. PROVIDES_CONNTRACK(ftp); */
+#define PROVIDES_CONNTRACK(name)                        \
+        int needs_ip_conntrack_##name;                  \
+        EXPORT_SYMBOL(needs_ip_conntrack_##name)
+
+/*. eg. NEEDS_CONNTRACK(ftp); */
+#define NEEDS_CONNTRACK(name)                                           \
+        extern int needs_ip_conntrack_##name;                           \
+        static int *need_ip_conntrack_##name __attribute_used__ = &needs_ip_conntrack_##name
+
 #endif /* __KERNEL__ */
 #endif /* _IP_CONNTRACK_H */
diff --git a/include/linux/netfilter_ipv4/ip_nat_helper.h b/include/linux/netfilter_ipv4/ip_nat_helper.h
index 633a9c37170d..185a24a6a047 100644
--- a/include/linux/netfilter_ipv4/ip_nat_helper.h
+++ b/include/linux/netfilter_ipv4/ip_nat_helper.h
@@ -3,14 +3,13 @@
 /* NAT protocol helper routines. */
 
 #include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/module.h>
 
 struct sk_buff;
 
 /* Flags */
 /* NAT helper must be called on every packet (for TCP) */
 #define IP_NAT_HELPER_F_ALWAYS		0x01
-/* Standalone NAT helper, without a conntrack part */
-#define IP_NAT_HELPER_F_STANDALONE	0x02
 
 struct ip_nat_helper
 {
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 30de192de7a9..d1df1ff56ed8 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -108,7 +108,6 @@ struct netlink_skb_parms
 extern int netlink_attach(int unit, int (*function)(int,struct sk_buff *skb));
 extern void netlink_detach(int unit);
 extern int netlink_post(int unit, struct sk_buff *skb);
-extern int init_netlink(void);
 extern struct sock *netlink_kernel_create(int unit, void (*input)(struct sock *sk, int len));
 extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
 extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 pid, int nonblock);
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 46144681c5a7..37b5ac010c7b 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -104,19 +104,21 @@ enum
 /* Netlink configuration messages.  */
 #define XFRM_MSG_BASE		0x10
 
-#define XFRM_MSG_NEWSA		(RTM_BASE + 0)
-#define XFRM_MSG_DELSA		(RTM_BASE + 1)
-#define XFRM_MSG_GETSA		(RTM_BASE + 2)
+#define XFRM_MSG_NEWSA		(XFRM_MSG_BASE + 0)
+#define XFRM_MSG_DELSA		(XFRM_MSG_BASE + 1)
+#define XFRM_MSG_GETSA		(XFRM_MSG_BASE + 2)
 
-#define XFRM_MSG_NEWPOLICY	(RTM_BASE + 3)
-#define XFRM_MSG_DELPOLICY	(RTM_BASE + 4)
-#define XFRM_MSG_GETPOLICY	(RTM_BASE + 5)
+#define XFRM_MSG_NEWPOLICY	(XFRM_MSG_BASE + 3)
+#define XFRM_MSG_DELPOLICY	(XFRM_MSG_BASE + 4)
+#define XFRM_MSG_GETPOLICY	(XFRM_MSG_BASE + 5)
 
-#define XFRM_MSG_ALLOCSPI	(RTM_BASE + 6)
-#define XFRM_MSG_ACQUIRE	(RTM_BASE + 7)
-#define XFRM_MSG_EXPIRE		(RTM_BASE + 8)
+#define XFRM_MSG_ALLOCSPI	(XFRM_MSG_BASE + 6)
+#define XFRM_MSG_ACQUIRE	(XFRM_MSG_BASE + 7)
+#define XFRM_MSG_EXPIRE		(XFRM_MSG_BASE + 8)
 
-#define XFRM_MSG_MAX		(XFRM_MSG_EXPIRE+1)
+#define XFRM_MSG_UPDPOLICY	(XFRM_MSG_BASE + 9)
+
+#define XFRM_MSG_MAX		(XFRM_MSG_UPDPOLICY+1)
 
 struct xfrm_user_tmpl {
 	struct xfrm_id		id;