[DCCP]: Use sk->sk_prot->max_header consistently for non-data packets

Using this also provides opportunities for introducing
inet_csk_alloc_skb that would call alloc_skb, account it to the sock
and skb_reserve(max_header), but I'll leave this for later, for now
using sk_prot->max_header consistently is enough.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 5 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 7098f1055f4a..64b7f8bda42d 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -201,7 +201,7 @@ static void dccp_v4_ctl_send_ack(struct sk_buff *rxskb)
 {
         int err;
         struct dccp_hdr *rxdh = dccp_hdr(rxskb), *dh;
-        const int dccp_hdr_ack_len = sizeof(struct dccp_hdr) +
+        const u32 dccp_hdr_ack_len = sizeof(struct dccp_hdr) +
                                      sizeof(struct dccp_hdr_ext) +
                                      sizeof(struct dccp_hdr_ack_bits);
         struct sk_buff *skb;
@@ -209,12 +209,12 @@ static void dccp_v4_ctl_send_ack(struct sk_buff *rxskb)
         if (((struct rtable *)rxskb->dst)->rt_type != RTN_LOCAL)
                 return;
 
-        skb = alloc_skb(MAX_DCCP_HEADER + 15, GFP_ATOMIC);
+        skb = alloc_skb(dccp_v4_ctl_socket->sk->sk_prot->max_header, GFP_ATOMIC);
         if (skb == NULL)
                 return;
 
         /* Reserve space for headers. */
-        skb_reserve(skb, MAX_DCCP_HEADER);
+        skb_reserve(skb, dccp_v4_ctl_socket->sk->sk_prot->max_header);
 
         skb->dst = dst_clone(rxskb->dst);
 
@@ -715,12 +715,13 @@ static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb)
         if (dst == NULL)
                 return;
 
-        skb = alloc_skb(MAX_DCCP_HEADER + 15, GFP_ATOMIC);
+        skb = alloc_skb(dccp_v4_ctl_socket->sk->sk_prot->max_header,
+                        GFP_ATOMIC);
         if (skb == NULL)
                 goto out;
 
         /* Reserve space for headers. */
-        skb_reserve(skb, MAX_DCCP_HEADER);
+        skb_reserve(skb, dccp_v4_ctl_socket->sk->sk_prot->max_header);
         skb->dst = dst_clone(dst);
 
         skb->h.raw = skb_push(skb, dccp_hdr_reset_len);