networking: make skb_push & __skb_push return void pointers
It seems like a historic accident that these return unsigned char *, and in many places that means casts are required, more often than not. Make these functions return void * and remove all the casts across the tree, adding a (u8 *) cast only where the unsigned char pointer was used directly, all done with the following spatch: @@ expression SKB, LEN; typedef u8; identifier fn = { skb_push, __skb_push, skb_push_rcsum }; @@ - *(fn(SKB, LEN)) + *(u8 *)fn(SKB, LEN) @@ expression E, SKB, LEN; identifier fn = { skb_push, __skb_push, skb_push_rcsum }; type T; @@ - E = ((T *)(fn(SKB, LEN))) + E = fn(SKB, LEN) @@ expression SKB, LEN; identifier fn = { skb_push, __skb_push, skb_push_rcsum }; @@ - fn(SKB, LEN)[0] + *(u8 *)fn(SKB, LEN) Note that the last part there converts from push(...)[0] to the more idiomatic *(u8 *)push(...). Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
af72868b90
commit
d58ff35122
@@ -131,8 +131,7 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,
|
||||
|
||||
if (prism_header == 1) {
|
||||
struct linux_wlan_ng_prism_hdr *hdr;
|
||||
hdr = (struct linux_wlan_ng_prism_hdr *)
|
||||
skb_push(skb, phdrlen);
|
||||
hdr = skb_push(skb, phdrlen);
|
||||
memset(hdr, 0, phdrlen);
|
||||
hdr->msgcode = LWNG_CAP_DID_BASE;
|
||||
hdr->msglen = sizeof(*hdr);
|
||||
@@ -153,8 +152,7 @@ hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
|
||||
#undef LWNG_SETVAL
|
||||
} else if (prism_header == 2) {
|
||||
struct linux_wlan_ng_cap_hdr *hdr;
|
||||
hdr = (struct linux_wlan_ng_cap_hdr *)
|
||||
skb_push(skb, phdrlen);
|
||||
hdr = skb_push(skb, phdrlen);
|
||||
memset(hdr, 0, phdrlen);
|
||||
hdr->version = htonl(LWNG_CAPHDR_VERSION);
|
||||
hdr->length = htonl(phdrlen);
|
||||
@@ -172,7 +170,7 @@ hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
|
||||
hdr->encoding = htonl(1); /* cck */
|
||||
} else if (prism_header == 3) {
|
||||
struct hostap_radiotap_rx *hdr;
|
||||
hdr = (struct hostap_radiotap_rx *)skb_push(skb, phdrlen);
|
||||
hdr = skb_push(skb, phdrlen);
|
||||
memset(hdr, 0, phdrlen);
|
||||
hdr->hdr.it_len = cpu_to_le16(phdrlen);
|
||||
hdr->hdr.it_present =
|
||||
|
@@ -396,7 +396,7 @@ int orinoco_process_xmit_skb(struct sk_buff *skb,
|
||||
memcpy(hdr.encap, encaps_hdr, sizeof(encaps_hdr));
|
||||
|
||||
/* Make room for the new header, and copy it in */
|
||||
eh = (struct ethhdr *) skb_push(skb, ENCAPS_OVERHEAD);
|
||||
eh = skb_push(skb, ENCAPS_OVERHEAD);
|
||||
memcpy(eh, &hdr, sizeof(hdr));
|
||||
}
|
||||
|
||||
@@ -1029,11 +1029,10 @@ static void orinoco_rx(struct net_device *dev,
|
||||
/* These indicate a SNAP within 802.2 LLC within
|
||||
802.11 frame which we'll need to de-encapsulate to
|
||||
the original EthernetII frame. */
|
||||
hdr = (struct ethhdr *)skb_push(skb,
|
||||
ETH_HLEN - ENCAPS_OVERHEAD);
|
||||
hdr = skb_push(skb, ETH_HLEN - ENCAPS_OVERHEAD);
|
||||
} else {
|
||||
/* 802.3 frame - prepend 802.3 header as is */
|
||||
hdr = (struct ethhdr *)skb_push(skb, ETH_HLEN);
|
||||
hdr = skb_push(skb, ETH_HLEN);
|
||||
hdr->h_proto = htons(length);
|
||||
}
|
||||
memcpy(hdr->h_dest, desc->addr1, ETH_ALEN);
|
||||
|
@@ -815,8 +815,8 @@ void p54_tx_80211(struct ieee80211_hw *dev,
|
||||
}
|
||||
}
|
||||
|
||||
txhdr = (struct p54_tx_data *) skb_push(skb, sizeof(*txhdr) + padding);
|
||||
hdr = (struct p54_hdr *) skb_push(skb, sizeof(*hdr));
|
||||
txhdr = skb_push(skb, sizeof(*txhdr) + padding);
|
||||
hdr = skb_push(skb, sizeof(*hdr));
|
||||
|
||||
if (padding)
|
||||
hdr_flags |= P54_HDR_FLAG_DATA_ALIGN;
|
||||
|
@@ -276,10 +276,7 @@ islpci_monitor_rx(islpci_private *priv, struct sk_buff **skb)
|
||||
}
|
||||
|
||||
/* make room for the new header and fill it. */
|
||||
avs =
|
||||
(struct avs_80211_1_header *) skb_push(*skb,
|
||||
sizeof (struct
|
||||
avs_80211_1_header));
|
||||
avs = skb_push(*skb, sizeof(struct avs_80211_1_header));
|
||||
|
||||
avs->version = cpu_to_be32(P80211CAPTURE_VERSION);
|
||||
avs->length = cpu_to_be32(sizeof (struct avs_80211_1_header));
|
||||
|
Reference in New Issue
Block a user