[DCCP]: Combine allocating & zeroing header space on skb

This is a code simplification:
it combines three often recurring operations into one inline function,

        * allocate `len' bytes header space in skb
        * fill these `len' bytes with zeroes
        * cast the start of this header space as dccp_hdr

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index de64e6c7f93d..ce8eed32dbeb 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -212,12 +212,9 @@ static void dccp_v4_reqsk_send_ack(struct sk_buff *rxskb,
 
         /* Reserve space for headers. */
         skb_reserve(skb, dccp_v4_ctl_socket->sk->sk_prot->max_header);
-
         skb->dst = dst_clone(rxskb->dst);
 
-        skb->h.raw = skb_push(skb, dccp_hdr_ack_len);
-        dh = dccp_hdr(skb);
-        memset(dh, 0, dccp_hdr_ack_len);
+        dh = dccp_zeroed_hdr(skb, dccp_hdr_ack_len);
 
         /* Build DCCP header and checksum it. */
         dh->dccph_type     = DCCP_PKT_ACK;
@@ -720,9 +717,7 @@ static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb)
         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);
-        dh = dccp_hdr(skb);
-        memset(dh, 0, dccp_hdr_reset_len);
+        dh = dccp_zeroed_hdr(skb, dccp_hdr_reset_len);
 
         /* Build DCCP header and checksum it. */
         dh->dccph_type     = DCCP_PKT_RESET;