13 files changed, 122 insertions, 137 deletions

diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 13cd7835d0df..7034facf8b8f 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -51,6 +51,7 @@ int seq_open_net(struct inode *ino, struct file *f,
 }
 EXPORT_SYMBOL_GPL(seq_open_net);
 
+#ifdef CONFIG_NET
 int seq_release_net(struct inode *ino, struct file *f)
 {
         struct seq_file *seq;
@@ -218,3 +219,4 @@ int __init proc_net_init(void)
 
         return register_pernet_subsys(&proc_net_ns_ops);
 }
+#endif /* CONFIG_NET */
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index d870a8253769..5da70c3f4417 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -63,6 +63,7 @@ extern struct list_head *seq_list_start_head(struct list_head *head,
 extern struct list_head *seq_list_next(void *v, struct list_head *head,
                 loff_t *ppos);
 
+#ifdef CONFIG_NET
 struct net;
 struct seq_net_private {
 #ifdef CONFIG_NET_NS
@@ -81,6 +82,7 @@ static inline struct net *seq_file_net(struct seq_file *seq)
         return &init_net;
 #endif
 }
+#endif  /* CONFIG_NET */
 
 #endif
 #endif
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7beb239d2ee0..ff72145d5d9e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -892,6 +892,7 @@ static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset)
 /*
  *      Add data to an sk_buff
  */
+extern unsigned char *skb_put(struct sk_buff *skb, unsigned int len);
 static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
 {
         unsigned char *tmp = skb_tail_pointer(skb);
@@ -901,26 +902,7 @@ static inline unsigned char *__skb_put(struct sk_buff *skb, unsigned int len)
         return tmp;
 }
 
-/**
- *      skb_put - add data to a buffer
- *      @skb: buffer to use
- *      @len: amount of data to add
- *
- *      This function extends the used data area of the buffer. If this would
- *      exceed the total buffer size the kernel will panic. A pointer to the
- *      first byte of the extra data is returned.
- */
-static inline unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
-{
-        unsigned char *tmp = skb_tail_pointer(skb);
-        SKB_LINEAR_ASSERT(skb);
-        skb->tail += len;
-        skb->len  += len;
-        if (unlikely(skb->tail > skb->end))
-                skb_over_panic(skb, len, current_text_addr());
-        return tmp;
-}
-
+extern unsigned char *skb_push(struct sk_buff *skb, unsigned int len);
 static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
 {
         skb->data -= len;
@@ -928,24 +910,7 @@ static inline unsigned char *__skb_push(struct sk_buff *skb, unsigned int len)
         return skb->data;
 }
 
-/**
- *      skb_push - add data to the start of a buffer
- *      @skb: buffer to use
- *      @len: amount of data to add
- *
- *      This function extends the used data area of the buffer at the buffer
- *      start. If this would exceed the total buffer headroom the kernel will
- *      panic. A pointer to the first byte of the extra data is returned.
- */
-static inline unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
-{
-        skb->data -= len;
-        skb->len  += len;
-        if (unlikely(skb->data<skb->head))
-                skb_under_panic(skb, len, current_text_addr());
-        return skb->data;
-}
-
+extern unsigned char *skb_pull(struct sk_buff *skb, unsigned int len);
 static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
 {
         skb->len -= len;
@@ -953,21 +918,6 @@ static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
         return skb->data += len;
 }
 
-/**
- *      skb_pull - remove data from the start of a buffer
- *      @skb: buffer to use
- *      @len: amount of data to remove
- *
- *      This function removes data from the start of a buffer, returning
- *      the memory to the headroom. A pointer to the next data in the buffer
- *      is returned. Once the data has been pulled future pushes will overwrite
- *      the old data.
- */
-static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
-{
-        return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
-}
-
 extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
 
 static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len)
@@ -1208,21 +1158,7 @@ static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
         skb_set_tail_pointer(skb, len);
 }
 
-/**
- *      skb_trim - remove end from a buffer
- *      @skb: buffer to alter
- *      @len: new length
- *
- *      Cut the length of a buffer down by removing data from the tail. If
- *      the buffer is already under the length specified it is not modified.
- *      The skb must be linear.
- */
-static inline void skb_trim(struct sk_buff *skb, unsigned int len)
-{
-        if (skb->len > len)
-                __skb_trim(skb, len);
-}
-
+extern void skb_trim(struct sk_buff *skb, unsigned int len);
 
 static inline int __pskb_trim(struct sk_buff *skb, unsigned int len)
 {
@@ -1305,22 +1241,7 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
         return skb;
 }
 
-/**
- *      dev_alloc_skb - allocate an skbuff for receiving
- *      @length: length to allocate
- *
- *      Allocate a new &sk_buff and assign it a usage count of one. The
- *      buffer has unspecified headroom built in. Users should allocate
- *      the headroom they think they need without accounting for the
- *      built in space. The built in space is used for optimisations.
- *
- *      %NULL is returned if there is no free memory. Although this function
- *      allocates memory it can be called from an interrupt.
- */
-static inline struct sk_buff *dev_alloc_skb(unsigned int length)
-{
-        return __dev_alloc_skb(length, GFP_ATOMIC);
-}
+extern struct sk_buff *dev_alloc_skb(unsigned int length);
 
 extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
                 unsigned int length, gfp_t gfp_mask);
diff --git a/include/net/dst.h b/include/net/dst.h
index ae13370e8484..002500e631f5 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -163,15 +163,7 @@ struct dst_entry * dst_clone(struct dst_entry * dst)
         return dst;
 }
 
-static inline
-void dst_release(struct dst_entry * dst)
-{
-        if (dst) {
-                WARN_ON(atomic_read(&dst->__refcnt) < 1);
-                smp_mb__before_atomic_dec();
-                atomic_dec(&dst->__refcnt);
-        }
-}
+extern void dst_release(struct dst_entry *dst);
 
 /* Children define the path of the packet through the
  * Linux networking.  Thus, destinations are stackable.
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 296f61d84709..5738c1c73ac1 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -250,15 +250,6 @@ int ip6_frag_mem(struct net *net);
 
 #define IPV6_FRAG_TIMEOUT       (60*HZ)         /* 60 seconds */
 
-/*
- *      Function prototype for build_xmit
- */
-
-typedef int             (*inet_getfrag_t) (const void *data,
-                                           struct in6_addr *addr,
-                                           char *,
-                                           unsigned int, unsigned int);
-
 extern int __ipv6_addr_type(const struct in6_addr *addr);
 static inline int ipv6_addr_type(const struct in6_addr *addr)
 {
@@ -510,14 +501,6 @@ extern int			ip6_local_out(struct sk_buff *skb);
  *      Extension header (options) processing
  */
 
-extern u8 *                     ipv6_build_nfrag_opts(struct sk_buff *skb,
-                                                      u8 *prev_hdr,
-                                                      struct ipv6_txoptions *opt,
-                                                      struct in6_addr *daddr,
-                                                      u32 jumbolen);
-extern u8 *                     ipv6_build_frag_opts(struct sk_buff *skb,
-                                                     u8 *prev_hdr,
-                                                     struct ipv6_txoptions *opt);
 extern void                     ipv6_push_nfrag_opts(struct sk_buff *skb,
                                                      struct ipv6_txoptions *opt,
                                                      u8 *proto,
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index d349c66ef828..aa9e282db485 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -353,7 +353,7 @@ tcf_match_indev(struct sk_buff *skb, char *indev)
         if (indev[0]) {
                 if  (!skb->iif)
                         return 0;
-                dev = __dev_get_by_index(&init_net, skb->iif);
+                dev = __dev_get_by_index(dev_net(skb->dev), skb->iif);
                 if (!dev || strcmp(indev, dev->name))
                         return 0;
         }
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index 10ae2da6f93b..4263af857794 100644
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -205,12 +205,11 @@ typedef struct {
 int sctp_init_cmd_seq(sctp_cmd_seq_t *seq);
 
 /* Add a command to an sctp_cmd_seq_t.
- * Return 0 if the command sequence is full.
  *
  * Use the SCTP_* constructors defined by SCTP_ARG_CONSTRUCTOR() above
  * to wrap data which goes in the obj argument.
  */
-int sctp_add_cmd(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj);
+void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj);
 
 /* Return the next command structure in an sctp_cmd_seq.
  * Return NULL at the end of the sequence.
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index ef9e7ed2c82e..24811732bdb2 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -385,14 +385,6 @@ static inline int ADDIP_SERIAL_gte(__u16 s, __u16 t)
         return (((s) == (t)) || (((t) - (s)) & ADDIP_SERIAL_SIGN_BIT));
 }
 
-
-/* Run sctp_add_cmd() generating a BUG() if there is a failure.  */
-static inline void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj)
-{
-        if (unlikely(!sctp_add_cmd(seq, verb, obj)))
-                BUG();
-}
-
 /* Check VTAG of the packet matches the sender's own tag. */
 static inline int
 sctp_vtag_verify(const struct sctp_chunk *chunk,
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 5a402e2982af..0d56dad319ad 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -15,12 +15,16 @@
  */
 
 #include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/kobject.h>
+#include <linux/module.h>
+
+#ifdef CONFIG_NET
 #include <linux/socket.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
-#include <linux/string.h>
-#include <linux/kobject.h>
 #include <net/sock.h>
+#endif
 
 
 u64 uevent_seqnum;
diff --git a/net/core/dst.c b/net/core/dst.c
index 694cd2a3f6d2..fe03266130b6 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -259,6 +259,16 @@ again:
         return NULL;
 }
 
+void dst_release(struct dst_entry *dst)
+{
+        if (dst) {
+                WARN_ON(atomic_read(&dst->__refcnt) < 1);
+                smp_mb__before_atomic_dec();
+                atomic_dec(&dst->__refcnt);
+        }
+}
+EXPORT_SYMBOL(dst_release);
+
 /* Dirty hack. We did it in 2.2 (in __dst_free),
  * we have _very_ good reasons not to repeat
  * this mistake in 2.3, but we have no choice
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 0d0fd28a9041..86e5682728be 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -263,6 +263,24 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
         return skb;
 }
 
+/**
+ *      dev_alloc_skb - allocate an skbuff for receiving
+ *      @length: length to allocate
+ *
+ *      Allocate a new &sk_buff and assign it a usage count of one. The
+ *      buffer has unspecified headroom built in. Users should allocate
+ *      the headroom they think they need without accounting for the
+ *      built in space. The built in space is used for optimisations.
+ *
+ *      %NULL is returned if there is no free memory. Although this function
+ *      allocates memory it can be called from an interrupt.
+ */
+struct sk_buff *dev_alloc_skb(unsigned int length)
+{
+        return __dev_alloc_skb(length, GFP_ATOMIC);
+}
+EXPORT_SYMBOL(dev_alloc_skb);
+
 static void skb_drop_list(struct sk_buff **listp)
 {
         struct sk_buff *list = *listp;
@@ -857,6 +875,78 @@ free_skb:
         return err;
 }
 
+/**
+ *      skb_put - add data to a buffer
+ *      @skb: buffer to use
+ *      @len: amount of data to add
+ *
+ *      This function extends the used data area of the buffer. If this would
+ *      exceed the total buffer size the kernel will panic. A pointer to the
+ *      first byte of the extra data is returned.
+ */
+unsigned char *skb_put(struct sk_buff *skb, unsigned int len)
+{
+        unsigned char *tmp = skb_tail_pointer(skb);
+        SKB_LINEAR_ASSERT(skb);
+        skb->tail += len;
+        skb->len  += len;
+        if (unlikely(skb->tail > skb->end))
+                skb_over_panic(skb, len, __builtin_return_address(0));
+        return tmp;
+}
+EXPORT_SYMBOL(skb_put);
+
+/**
+ *      skb_push - add data to the start of a buffer
+ *      @skb: buffer to use
+ *      @len: amount of data to add
+ *
+ *      This function extends the used data area of the buffer at the buffer
+ *      start. If this would exceed the total buffer headroom the kernel will
+ *      panic. A pointer to the first byte of the extra data is returned.
+ */
+unsigned char *skb_push(struct sk_buff *skb, unsigned int len)
+{
+        skb->data -= len;
+        skb->len  += len;
+        if (unlikely(skb->data<skb->head))
+                skb_under_panic(skb, len, __builtin_return_address(0));
+        return skb->data;
+}
+EXPORT_SYMBOL(skb_push);
+
+/**
+ *      skb_pull - remove data from the start of a buffer
+ *      @skb: buffer to use
+ *      @len: amount of data to remove
+ *
+ *      This function removes data from the start of a buffer, returning
+ *      the memory to the headroom. A pointer to the next data in the buffer
+ *      is returned. Once the data has been pulled future pushes will overwrite
+ *      the old data.
+ */
+unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
+{
+        return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
+}
+EXPORT_SYMBOL(skb_pull);
+
+/**
+ *      skb_trim - remove end from a buffer
+ *      @skb: buffer to alter
+ *      @len: new length
+ *
+ *      Cut the length of a buffer down by removing data from the tail. If
+ *      the buffer is already under the length specified it is not modified.
+ *      The skb must be linear.
+ */
+void skb_trim(struct sk_buff *skb, unsigned int len)
+{
+        if (skb->len > len)
+                __skb_trim(skb, len);
+}
+EXPORT_SYMBOL(skb_trim);
+
 /* Trims skb to length len. It can change skb pointers.
  */
 
diff --git a/net/sctp/command.c b/net/sctp/command.c
index bb977330002a..c0044019db9e 100644
--- a/net/sctp/command.c
+++ b/net/sctp/command.c
@@ -52,18 +52,12 @@ int sctp_init_cmd_seq(sctp_cmd_seq_t *seq)
 /* Add a command to a sctp_cmd_seq_t.
  * Return 0 if the command sequence is full.
  */
-int sctp_add_cmd(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj)
+void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj)
 {
-        if (seq->next_free_slot >= SCTP_MAX_NUM_COMMANDS)
-                goto fail;
+        BUG_ON(seq->next_free_slot >= SCTP_MAX_NUM_COMMANDS);
 
         seq->cmds[seq->next_free_slot].verb = verb;
         seq->cmds[seq->next_free_slot++].obj = obj;
-
-        return 1;
-
-fail:
-        return 0;
 }
 
 /* Return the next command structure in a sctp_cmd_seq.
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 6545b5fcbc73..b534dbef864f 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3135,12 +3135,8 @@ sctp_disposition_t sctp_sf_operr_notify(const struct sctp_endpoint *ep,
                 if (!ev)
                         goto nomem;
 
-                if (!sctp_add_cmd(commands, SCTP_CMD_EVENT_ULP,
-                                  SCTP_ULPEVENT(ev))) {
-                        sctp_ulpevent_free(ev);
-                        goto nomem;
-                }
-
+                sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP,
+                                SCTP_ULPEVENT(ev));
                 sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_OPERR,
                                 SCTP_CHUNK(chunk));
         }