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>
This commit is contained in:

zatwierdzone przez
David S. Miller

rodzic
4df864c1d9
commit
af72868b90
@@ -239,7 +239,7 @@ static int a2mp_discover_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
}
|
||||
|
||||
len -= sizeof(*cl);
|
||||
cl = (void *) skb_pull(skb, sizeof(*cl));
|
||||
cl = skb_pull(skb, sizeof(*cl));
|
||||
}
|
||||
|
||||
/* Fall back to L2CAP init sequence */
|
||||
@@ -279,7 +279,7 @@ static int a2mp_change_notify(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
while (skb->len >= sizeof(*cl)) {
|
||||
BT_DBG("Controller id %d type %d status %d", cl->id, cl->type,
|
||||
cl->status);
|
||||
cl = (struct a2mp_cl *) skb_pull(skb, sizeof(*cl));
|
||||
cl = skb_pull(skb, sizeof(*cl));
|
||||
}
|
||||
|
||||
/* TODO send A2MP_CHANGE_RSP */
|
||||
|
Reference in New Issue
Block a user