Merge git://git.infradead.org/mtd-2.6

[powerpc.git] / net / dccp / output.c

diff --git a/net/dccp/output.c b/net/dccp/output.c
index 6bd21e3..58669be 100644 (file)
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -10,7 +10,6 @@
  *     2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/dccp.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
@@ -27,7 +26,7 @@ static inline void dccp_event_ack_sent(struct sock *sk)
        inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);
 }
 
-static inline void dccp_skb_entail(struct sock *sk, struct sk_buff *skb)
+static void dccp_skb_entail(struct sock *sk, struct sk_buff *skb)
 {
        skb_set_owner_w(skb, sk);
        WARN_ON(sk->sk_send_head);
@@ -49,7 +48,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
                struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
                struct dccp_hdr *dh;
                /* XXX For now we're using only 48 bits sequence numbers */
-               const int dccp_header_size = sizeof(*dh) +
+               const u32 dccp_header_size = sizeof(*dh) +
                                             sizeof(struct dccp_hdr_ext) +
                                          dccp_packet_hdr_len(dcb->dccpd_type);
                int err, set_ack = 1;
@@ -83,7 +82,11 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
                }
 
                dcb->dccpd_seq = dp->dccps_gss;
-               dccp_insert_options(sk, skb);
+
+               if (dccp_insert_options(sk, skb)) {
+                       kfree_skb(skb);
+                       return -EPROTO;
+               }
                
                skb->h.raw = skb_push(skb, dccp_header_size);
                dh = dccp_hdr(skb);
@@ -279,17 +282,16 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
 {
        struct dccp_hdr *dh;
        struct dccp_request_sock *dreq;
-       const int dccp_header_size = sizeof(struct dccp_hdr) +
+       const u32 dccp_header_size = sizeof(struct dccp_hdr) +
                                     sizeof(struct dccp_hdr_ext) +
                                     sizeof(struct dccp_hdr_response);
-       struct sk_buff *skb = sock_wmalloc(sk, MAX_HEADER + DCCP_MAX_OPT_LEN +
-                                              dccp_header_size, 1,
+       struct sk_buff *skb = sock_wmalloc(sk, sk->sk_prot->max_header, 1,
                                           GFP_ATOMIC);
        if (skb == NULL)
                return NULL;
 
        /* Reserve space for headers. */
-       skb_reserve(skb, MAX_HEADER + DCCP_MAX_OPT_LEN + dccp_header_size);
+       skb_reserve(skb, sk->sk_prot->max_header);
 
        skb->dst = dst_clone(dst);
        skb->csum = 0;
@@ -297,7 +299,11 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst,
        dreq = dccp_rsk(req);
        DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_RESPONSE;
        DCCP_SKB_CB(skb)->dccpd_seq  = dreq->dreq_iss;
-       dccp_insert_options(sk, skb);
+
+       if (dccp_insert_options(sk, skb)) {
+               kfree_skb(skb);
+               return NULL;
+       }
 
        skb->h.raw = skb_push(skb, dccp_header_size);
 
@@ -326,17 +332,16 @@ static struct sk_buff *dccp_make_reset(struct sock *sk, struct dst_entry *dst,
 {
        struct dccp_hdr *dh;
        struct dccp_sock *dp = dccp_sk(sk);
-       const int dccp_header_size = sizeof(struct dccp_hdr) +
+       const u32 dccp_header_size = sizeof(struct dccp_hdr) +
                                     sizeof(struct dccp_hdr_ext) +
                                     sizeof(struct dccp_hdr_reset);
-       struct sk_buff *skb = sock_wmalloc(sk, MAX_HEADER + DCCP_MAX_OPT_LEN +
-                                              dccp_header_size, 1,
+       struct sk_buff *skb = sock_wmalloc(sk, sk->sk_prot->max_header, 1,
                                           GFP_ATOMIC);
        if (skb == NULL)
                return NULL;
 
        /* Reserve space for headers. */
-       skb_reserve(skb, MAX_HEADER + DCCP_MAX_OPT_LEN + dccp_header_size);
+       skb_reserve(skb, sk->sk_prot->max_header);
 
        skb->dst = dst_clone(dst);
        skb->csum = 0;
@@ -346,7 +351,11 @@ static struct sk_buff *dccp_make_reset(struct sock *sk, struct dst_entry *dst,
        DCCP_SKB_CB(skb)->dccpd_reset_code = code;
        DCCP_SKB_CB(skb)->dccpd_type       = DCCP_PKT_RESET;
        DCCP_SKB_CB(skb)->dccpd_seq        = dp->dccps_gss;
-       dccp_insert_options(sk, skb);
+
+       if (dccp_insert_options(sk, skb)) {
+               kfree_skb(skb);
+               return NULL;
+       }
 
        skb->h.raw = skb_push(skb, dccp_header_size);
 
@@ -426,12 +435,12 @@ int dccp_connect(struct sock *sk)
 
        dccp_connect_init(sk);
 
-       skb = alloc_skb(MAX_DCCP_HEADER + 15, sk->sk_allocation);
+       skb = alloc_skb(sk->sk_prot->max_header, sk->sk_allocation);
        if (unlikely(skb == NULL))
                return -ENOBUFS;
 
        /* Reserve space for headers. */
-       skb_reserve(skb, MAX_DCCP_HEADER);
+       skb_reserve(skb, sk->sk_prot->max_header);
 
        DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_REQUEST;
        skb->csum = 0;
@@ -452,7 +461,8 @@ void dccp_send_ack(struct sock *sk)
 {
        /* If we have been reset, we may not send again. */
        if (sk->sk_state != DCCP_CLOSED) {
-               struct sk_buff *skb = alloc_skb(MAX_DCCP_HEADER, GFP_ATOMIC);
+               struct sk_buff *skb = alloc_skb(sk->sk_prot->max_header,
+                                               GFP_ATOMIC);
 
                if (skb == NULL) {
                        inet_csk_schedule_ack(sk);
@@ -464,7 +474,7 @@ void dccp_send_ack(struct sock *sk)
                }
 
                /* Reserve space for headers */
-               skb_reserve(skb, MAX_DCCP_HEADER);
+               skb_reserve(skb, sk->sk_prot->max_header);
                skb->csum = 0;
                DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_ACK;
                dccp_transmit_skb(sk, skb);
@@ -511,14 +521,14 @@ void dccp_send_sync(struct sock *sk, const u64 seq,
         * dccp_transmit_skb() will set the ownership to this
         * sock.
         */
-       struct sk_buff *skb = alloc_skb(MAX_DCCP_HEADER, GFP_ATOMIC);
+       struct sk_buff *skb = alloc_skb(sk->sk_prot->max_header, GFP_ATOMIC);
 
        if (skb == NULL)
                /* FIXME: how to make sure the sync is sent? */
                return;
 
        /* Reserve space for headers and prepare control bits. */
-       skb_reserve(skb, MAX_DCCP_HEADER);
+       skb_reserve(skb, sk->sk_prot->max_header);
        skb->csum = 0;
        DCCP_SKB_CB(skb)->dccpd_type = pkt_type;
        DCCP_SKB_CB(skb)->dccpd_seq = seq;
@@ -526,6 +536,8 @@ void dccp_send_sync(struct sock *sk, const u64 seq,
        dccp_transmit_skb(sk, skb);
 }
 
+EXPORT_SYMBOL_GPL(dccp_send_sync);
+
 /*
  * Send a DCCP_PKT_CLOSE/CLOSEREQ. The caller locks the socket for us. This
  * cannot be allowed to fail queueing a DCCP_PKT_CLOSE/CLOSEREQ frame under