networking: make skb_put & friends return void pointers

[linux-2.6-block.git] / net / irda / irlap_frame.c

diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index bf56ac7dba96abbfb906f0b27d407b812a2e283b..82e71e5622c28b448bfb5a340b917c832a9770d1 100644 (file)
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -133,7 +133,7 @@ void irlap_send_snrm_frame(struct irlap_cb *self, struct qos_info *qos)
        if (!tx_skb)
                return;
 
-       frame = (struct snrm_frame *) skb_put(tx_skb, 2);
+       frame = skb_put(tx_skb, 2);
 
        /* Insert connection address field */
        if (qos)
@@ -228,7 +228,7 @@ void irlap_send_ua_response_frame(struct irlap_cb *self, struct qos_info *qos)
        if (!tx_skb)
                return;
 
-       frame = (struct ua_frame *) skb_put(tx_skb, 10);
+       frame = skb_put(tx_skb, 10);
 
        /* Build UA response */
        frame->caddr = self->caddr;
@@ -268,7 +268,7 @@ void irlap_send_dm_frame( struct irlap_cb *self)
        if (!tx_skb)
                return;
 
-       frame = (struct dm_frame *)skb_put(tx_skb, 2);
+       frame = skb_put(tx_skb, 2);
 
        if (self->state == LAP_NDM)
                frame->caddr = CBROADCAST;
@@ -298,7 +298,7 @@ void irlap_send_disc_frame(struct irlap_cb *self)
        if (!tx_skb)
                return;
 
-       frame = (struct disc_frame *)skb_put(tx_skb, 2);
+       frame = skb_put(tx_skb, 2);
 
        frame->caddr = self->caddr | CMD_FRAME;
        frame->control = DISC_CMD | PF_BIT;
@@ -587,7 +587,7 @@ void irlap_send_rr_frame(struct irlap_cb *self, int command)
        if (!tx_skb)
                return;
 
-       frame = (struct rr_frame *)skb_put(tx_skb, 2);
+       frame = skb_put(tx_skb, 2);
 
        frame->caddr = self->caddr;
        frame->caddr |= (command) ? CMD_FRAME : 0;
@@ -612,7 +612,7 @@ void irlap_send_rd_frame(struct irlap_cb *self)
        if (!tx_skb)
                return;
 
-       frame = (struct rd_frame *)skb_put(tx_skb, 2);
+       frame = skb_put(tx_skb, 2);
 
        frame->caddr = self->caddr;
        frame->control = RD_RSP | PF_BIT;
@@ -1202,14 +1202,13 @@ void irlap_send_test_frame(struct irlap_cb *self, __u8 caddr, __u32 daddr,
 
        /* Broadcast frames must include saddr and daddr fields */
        if (caddr == CBROADCAST) {
-               frame = (struct test_frame *)
-                       skb_put(tx_skb, sizeof(struct test_frame));
+               frame = skb_put(tx_skb, sizeof(struct test_frame));
 
                /* Insert the swapped addresses */
                frame->saddr = cpu_to_le32(self->saddr);
                frame->daddr = cpu_to_le32(daddr);
        } else
-               frame = (struct test_frame *) skb_put(tx_skb, LAP_ADDR_HEADER + LAP_CTRL_HEADER);
+               frame = skb_put(tx_skb, LAP_ADDR_HEADER + LAP_CTRL_HEADER);
 
        frame->caddr = caddr;
        frame->control = TEST_RSP | PF_BIT;