4 files changed, 104 insertions, 14 deletions

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));
         }