networking: make skb_push & __skb_push return void pointers

[linux-block.git] / drivers / firewire / net.c

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index d5040bbd34e84135aa50964d4f4a10dfeec49698..242359c2d1f1839999fdfa68aff7c1ee708fc291 100644 (file)
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -219,7 +219,7 @@ static int fwnet_header_create(struct sk_buff *skb, struct net_device *net,
 {
        struct fwnet_header *h;
 
-       h = (struct fwnet_header *)skb_push(skb, sizeof(*h));
+       h = skb_push(skb, sizeof(*h));
        put_unaligned_be16(type, &h->h_proto);
 
        if (net->flags & (IFF_LOOPBACK | IFF_NOARP)) {
@@ -961,16 +961,14 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
        tx_len = ptask->max_payload;
        switch (fwnet_get_hdr_lf(&ptask->hdr)) {
        case RFC2374_HDR_UNFRAG:
-               bufhdr = (struct rfc2734_header *)
-                               skb_push(ptask->skb, RFC2374_UNFRAG_HDR_SIZE);
+               bufhdr = skb_push(ptask->skb, RFC2374_UNFRAG_HDR_SIZE);
                put_unaligned_be32(ptask->hdr.w0, &bufhdr->w0);
                break;
 
        case RFC2374_HDR_FIRSTFRAG:
        case RFC2374_HDR_INTFRAG:
        case RFC2374_HDR_LASTFRAG:
-               bufhdr = (struct rfc2734_header *)
-                               skb_push(ptask->skb, RFC2374_FRAG_HDR_SIZE);
+               bufhdr = skb_push(ptask->skb, RFC2374_FRAG_HDR_SIZE);
                put_unaligned_be32(ptask->hdr.w0, &bufhdr->w0);
                put_unaligned_be32(ptask->hdr.w1, &bufhdr->w1);
                break;