diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-06-16 08:29:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-16 11:48:40 -0400 |
commit | d58ff35122847a83ba55394e2ae3a1527b6febf5 (patch) | |
tree | e1ecf758e86519922c403f1aa88f19ef25a554ad /net/802 | |
parent | af72868b9070d1b843c829f0d0d0b22c04a20815 (diff) |
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>
Diffstat (limited to 'net/802')
-rw-r--r-- | net/802/fc.c | 4 | ||||
-rw-r--r-- | net/802/fddi.c | 2 | ||||
-rw-r--r-- | net/802/hippi.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/net/802/fc.c b/net/802/fc.c index 1bb496ea997e..058a9f708918 100644 --- a/net/802/fc.c +++ b/net/802/fc.c | |||
@@ -49,7 +49,7 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev, | |||
49 | struct fcllc *fcllc; | 49 | struct fcllc *fcllc; |
50 | 50 | ||
51 | hdr_len = sizeof(struct fch_hdr) + sizeof(struct fcllc); | 51 | hdr_len = sizeof(struct fch_hdr) + sizeof(struct fcllc); |
52 | fch = (struct fch_hdr *)skb_push(skb, hdr_len); | 52 | fch = skb_push(skb, hdr_len); |
53 | fcllc = (struct fcllc *)(fch+1); | 53 | fcllc = (struct fcllc *)(fch+1); |
54 | fcllc->dsap = fcllc->ssap = EXTENDED_SAP; | 54 | fcllc->dsap = fcllc->ssap = EXTENDED_SAP; |
55 | fcllc->llc = UI_CMD; | 55 | fcllc->llc = UI_CMD; |
@@ -59,7 +59,7 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev, | |||
59 | else | 59 | else |
60 | { | 60 | { |
61 | hdr_len = sizeof(struct fch_hdr); | 61 | hdr_len = sizeof(struct fch_hdr); |
62 | fch = (struct fch_hdr *)skb_push(skb, hdr_len); | 62 | fch = skb_push(skb, hdr_len); |
63 | } | 63 | } |
64 | 64 | ||
65 | if(saddr) | 65 | if(saddr) |
diff --git a/net/802/fddi.c b/net/802/fddi.c index 6356623fc238..90f1416567a1 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c | |||
@@ -58,7 +58,7 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev, | |||
58 | 58 | ||
59 | if(type != ETH_P_IP && type != ETH_P_IPV6 && type != ETH_P_ARP) | 59 | if(type != ETH_P_IP && type != ETH_P_IPV6 && type != ETH_P_ARP) |
60 | hl=FDDI_K_8022_HLEN-3; | 60 | hl=FDDI_K_8022_HLEN-3; |
61 | fddi = (struct fddihdr *)skb_push(skb, hl); | 61 | fddi = skb_push(skb, hl); |
62 | fddi->fc = FDDI_FC_K_ASYNC_LLC_DEF; | 62 | fddi->fc = FDDI_FC_K_ASYNC_LLC_DEF; |
63 | if(type == ETH_P_IP || type == ETH_P_IPV6 || type == ETH_P_ARP) | 63 | if(type == ETH_P_IP || type == ETH_P_IPV6 || type == ETH_P_ARP) |
64 | { | 64 | { |
diff --git a/net/802/hippi.c b/net/802/hippi.c index 4460606e9c36..690308b9b94a 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c | |||
@@ -47,7 +47,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev, | |||
47 | unsigned short type, | 47 | unsigned short type, |
48 | const void *daddr, const void *saddr, unsigned int len) | 48 | const void *daddr, const void *saddr, unsigned int len) |
49 | { | 49 | { |
50 | struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN); | 50 | struct hippi_hdr *hip = skb_push(skb, HIPPI_HLEN); |
51 | struct hippi_cb *hcb = (struct hippi_cb *) skb->cb; | 51 | struct hippi_cb *hcb = (struct hippi_cb *) skb->cb; |
52 | 52 | ||
53 | if (!len){ | 53 | if (!len){ |