networking: make skb_put & friends return void pointers

[sfrench/cifs-2.6.git] / net / ipv4 / netfilter / nf_reject_ipv4.c

diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c
index 6f8d9e5e062bca9679bf8a01feaebcb80925e01f..eeacbdaf7cdf4918b7c556efa92df1da0f9f63ee 100644 (file)
--- a/net/ipv4/netfilter/nf_reject_ipv4.c
+++ b/net/ipv4/netfilter/nf_reject_ipv4.c
@@ -51,7 +51,7 @@ struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,
        struct iphdr *niph, *oiph = ip_hdr(oldskb);
 
        skb_reset_network_header(nskb);
-       niph = (struct iphdr *)skb_put(nskb, sizeof(struct iphdr));
+       niph = skb_put(nskb, sizeof(struct iphdr));
        niph->version   = 4;
        niph->ihl       = sizeof(struct iphdr) / 4;
        niph->tos       = 0;
@@ -76,8 +76,7 @@ void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb,
        struct tcphdr *tcph;
 
        skb_reset_transport_header(nskb);
-       tcph = (struct tcphdr *)skb_put(nskb, sizeof(struct tcphdr));
-       memset(tcph, 0, sizeof(*tcph));
+       tcph = skb_put_zero(nskb, sizeof(struct tcphdr));
        tcph->source    = oth->dest;
        tcph->dest      = oth->source;
        tcph->doff      = sizeof(struct tcphdr) / 4;