networking: make skb_put & friends return void pointers

[mirror_ubuntu-artful-kernel.git] / drivers / staging / rtl8192u / ieee80211 / ieee80211_softmac.c

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 903a1d0269df284f2c090b9a2fc19faaf1a1de11..107069180ed249fe52579f009423c6604de617e6 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -341,7 +341,7 @@ static inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)
 
        skb_reserve(skb, ieee->tx_headroom);
 
-       req = (struct ieee80211_probe_request *) skb_put(skb,sizeof(struct ieee80211_probe_request));
+       req = skb_put(skb, sizeof(struct ieee80211_probe_request));
        req->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
        req->header.duration_id = 0; /* FIXME: is this OK? */
 
@@ -349,7 +349,7 @@ static inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)
        memcpy(req->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
        eth_broadcast_addr(req->header.addr3);
 
-       tag = (u8 *) skb_put(skb,len+2+rate_len);
+       tag = skb_put(skb, len + 2 + rate_len);
 
        *tag++ = MFIE_TYPE_SSID;
        *tag++ = len;
@@ -659,8 +659,7 @@ ieee80211_authentication_req(struct ieee80211_network *beacon,
        if (!skb) return NULL;
 
        skb_reserve(skb, ieee->tx_headroom);
-       auth = (struct ieee80211_authentication *)
-               skb_put(skb, sizeof(struct ieee80211_authentication));
+       auth = skb_put(skb, sizeof(struct ieee80211_authentication));
 
        if (challengelen)
                auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH
@@ -768,7 +767,7 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d
        if (!skb)
                return NULL;
        skb_reserve(skb, ieee->tx_headroom);
-       beacon_buf = (struct ieee80211_probe_response *) skb_put(skb, (beacon_size - ieee->tx_headroom));
+       beacon_buf = skb_put(skb, (beacon_size - ieee->tx_headroom));
        memcpy (beacon_buf->header.addr1, dest,ETH_ALEN);
        memcpy (beacon_buf->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
        memcpy (beacon_buf->header.addr3, ieee->current_network.bssid, ETH_ALEN);
@@ -864,8 +863,7 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee,
 
        skb_reserve(skb, ieee->tx_headroom);
 
-       assoc = (struct ieee80211_assoc_response_frame *)
-               skb_put(skb, sizeof(struct ieee80211_assoc_response_frame));
+       assoc = skb_put(skb, sizeof(struct ieee80211_assoc_response_frame));
 
        assoc->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP);
        memcpy(assoc->header.addr1, dest,ETH_ALEN);
@@ -892,7 +890,7 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee,
        if (ieee->assoc_id == 0x2007) ieee->assoc_id=0;
        else ieee->assoc_id++;
 
-       tag = (u8 *) skb_put(skb, rate_len);
+       tag = skb_put(skb, rate_len);
 
        ieee80211_MFIE_Brate(ieee, &tag);
        ieee80211_MFIE_Grate(ieee, &tag);
@@ -940,7 +938,7 @@ static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee,
        if (!skb)
                return NULL;
 
-       hdr = (struct rtl_80211_hdr_3addr *)skb_put(skb,sizeof(struct rtl_80211_hdr_3addr));
+       hdr = skb_put(skb, sizeof(struct rtl_80211_hdr_3addr));
 
        memcpy(hdr->addr1, ieee->current_network.bssid, ETH_ALEN);
        memcpy(hdr->addr2, ieee->dev->dev_addr, ETH_ALEN);
@@ -1086,8 +1084,7 @@ ieee80211_association_req(struct ieee80211_network *beacon,
 
        skb_reserve(skb, ieee->tx_headroom);
 
-       hdr = (struct ieee80211_assoc_request_frame *)
-               skb_put(skb, sizeof(struct ieee80211_assoc_request_frame)+2);
+       hdr = skb_put(skb, sizeof(struct ieee80211_assoc_request_frame) + 2);
 
 
        hdr->header.frame_ctl = IEEE80211_STYPE_ASSOC_REQ;
@@ -3110,7 +3107,7 @@ static inline struct sk_buff *ieee80211_disassociate_skb(
        if (!skb)
                return NULL;
 
-       disass = (struct ieee80211_disassoc *) skb_put(skb, sizeof(struct ieee80211_disassoc));
+       disass = skb_put(skb, sizeof(struct ieee80211_disassoc));
        disass->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_DISASSOC);
        disass->header.duration_id = 0;