diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-06-16 08:29:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-16 11:48:39 -0400 |
| commit | af72868b9070d1b843c829f0d0d0b22c04a20815 (patch) | |
| tree | 537bb273e315e1238cff969adbfc70cb35ba9a44 /drivers/net | |
| parent | 4df864c1d9afb46e2461a9f808d9f11a42d31bad (diff) | |
networking: make skb_pull & friends 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_pull,
__skb_pull,
skb_pull_inline,
__pskb_pull_tail,
__pskb_pull,
pskb_pull
};
@@
- *(fn(SKB, LEN))
+ *(u8 *)fn(SKB, LEN)
@@
expression E, SKB, LEN;
identifier fn = {
skb_pull,
__skb_pull,
skb_pull_inline,
__pskb_pull_tail,
__pskb_pull,
pskb_pull
};
type T;
@@
- E = ((T *)(fn(SKB, LEN)))
+ E = fn(SKB, LEN)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wan/hdlc_ppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index fa3460a0dbbe..0d2e00ece804 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c | |||
| @@ -448,7 +448,7 @@ static int ppp_rx(struct sk_buff *skb) | |||
| 448 | /* Check HDLC header */ | 448 | /* Check HDLC header */ |
| 449 | if (skb->len < sizeof(struct hdlc_header)) | 449 | if (skb->len < sizeof(struct hdlc_header)) |
| 450 | goto rx_error; | 450 | goto rx_error; |
| 451 | cp = (struct cp_header*)skb_pull(skb, sizeof(struct hdlc_header)); | 451 | cp = skb_pull(skb, sizeof(struct hdlc_header)); |
| 452 | if (hdr->address != HDLC_ADDR_ALLSTATIONS || | 452 | if (hdr->address != HDLC_ADDR_ALLSTATIONS || |
| 453 | hdr->control != HDLC_CTRL_UI) | 453 | hdr->control != HDLC_CTRL_UI) |
| 454 | goto rx_error; | 454 | goto rx_error; |
