diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-06-16 08:29:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-16 11:48:40 -0400 |
commit | 634fef61076d644b989b86abc2f560d81a089a31 (patch) | |
tree | 41e0cfc0c640666a75ad07588df34addb18176d0 /drivers/isdn/gigaset | |
parent | d58ff35122847a83ba55394e2ae3a1527b6febf5 (diff) |
networking: add and use skb_put_u8()
Joe and Bjørn suggested that it'd be nicer to not have the
cast in the fairly common case of doing
*(u8 *)skb_put(skb, 1) = c;
Add skb_put_u8() for this case, and use it across the code,
using the following spatch:
@@
expression SKB, C, S;
typedef u8;
identifier fn = {skb_put};
fresh identifier fn2 = fn ## "_u8";
@@
- *(u8 *)fn(SKB, S) = C;
+ fn2(SKB, C);
Note that due to the "S", the spatch isn't perfect, it should
have checked that S is 1, but there's also places that use a
sizeof expression like sizeof(var) or sizeof(u8) etc. Turns
out that nobody ever did something like
*(u8 *)skb_put(skb, 2) = c;
which would be wrong anyway since the second byte wouldn't be
initialized.
Suggested-by: Joe Perches <joe@perches.com>
Suggested-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/gigaset')
-rw-r--r-- | drivers/isdn/gigaset/asyncdata.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c index 03ac9fbfe318..4caecdcc6f29 100644 --- a/drivers/isdn/gigaset/asyncdata.c +++ b/drivers/isdn/gigaset/asyncdata.c | |||
@@ -492,33 +492,33 @@ static struct sk_buff *HDLC_Encode(struct sk_buff *skb) | |||
492 | hdlc_skb->mac_len = skb->mac_len; | 492 | hdlc_skb->mac_len = skb->mac_len; |
493 | 493 | ||
494 | /* Add flag sequence in front of everything.. */ | 494 | /* Add flag sequence in front of everything.. */ |
495 | *(u8 *)skb_put(hdlc_skb, 1) = PPP_FLAG; | 495 | skb_put_u8(hdlc_skb, PPP_FLAG); |
496 | 496 | ||
497 | /* Perform byte stuffing while copying data. */ | 497 | /* Perform byte stuffing while copying data. */ |
498 | while (skb->len--) { | 498 | while (skb->len--) { |
499 | if (muststuff(*skb->data)) { | 499 | if (muststuff(*skb->data)) { |
500 | *(u8 *)skb_put(hdlc_skb, 1) = PPP_ESCAPE; | 500 | skb_put_u8(hdlc_skb, PPP_ESCAPE); |
501 | *(u8 *)skb_put(hdlc_skb, 1) = (*skb->data++) ^ PPP_TRANS; | 501 | skb_put_u8(hdlc_skb, (*skb->data++) ^ PPP_TRANS); |
502 | } else | 502 | } else |
503 | *(u8 *)skb_put(hdlc_skb, 1) = *skb->data++; | 503 | skb_put_u8(hdlc_skb, *skb->data++); |
504 | } | 504 | } |
505 | 505 | ||
506 | /* Finally add FCS (byte stuffed) and flag sequence */ | 506 | /* Finally add FCS (byte stuffed) and flag sequence */ |
507 | c = (fcs & 0x00ff); /* least significant byte first */ | 507 | c = (fcs & 0x00ff); /* least significant byte first */ |
508 | if (muststuff(c)) { | 508 | if (muststuff(c)) { |
509 | *(u8 *)skb_put(hdlc_skb, 1) = PPP_ESCAPE; | 509 | skb_put_u8(hdlc_skb, PPP_ESCAPE); |
510 | c ^= PPP_TRANS; | 510 | c ^= PPP_TRANS; |
511 | } | 511 | } |
512 | *(u8 *)skb_put(hdlc_skb, 1) = c; | 512 | skb_put_u8(hdlc_skb, c); |
513 | 513 | ||
514 | c = ((fcs >> 8) & 0x00ff); | 514 | c = ((fcs >> 8) & 0x00ff); |
515 | if (muststuff(c)) { | 515 | if (muststuff(c)) { |
516 | *(u8 *)skb_put(hdlc_skb, 1) = PPP_ESCAPE; | 516 | skb_put_u8(hdlc_skb, PPP_ESCAPE); |
517 | c ^= PPP_TRANS; | 517 | c ^= PPP_TRANS; |
518 | } | 518 | } |
519 | *(u8 *)skb_put(hdlc_skb, 1) = c; | 519 | skb_put_u8(hdlc_skb, c); |
520 | 520 | ||
521 | *(u8 *)skb_put(hdlc_skb, 1) = PPP_FLAG; | 521 | skb_put_u8(hdlc_skb, PPP_FLAG); |
522 | 522 | ||
523 | dev_kfree_skb_any(skb); | 523 | dev_kfree_skb_any(skb); |
524 | return hdlc_skb; | 524 | return hdlc_skb; |
@@ -561,8 +561,8 @@ static struct sk_buff *iraw_encode(struct sk_buff *skb) | |||
561 | while (len--) { | 561 | while (len--) { |
562 | c = bitrev8(*cp++); | 562 | c = bitrev8(*cp++); |
563 | if (c == DLE_FLAG) | 563 | if (c == DLE_FLAG) |
564 | *(u8 *)skb_put(iraw_skb, 1) = c; | 564 | skb_put_u8(iraw_skb, c); |
565 | *(u8 *)skb_put(iraw_skb, 1) = c; | 565 | skb_put_u8(iraw_skb, c); |
566 | } | 566 | } |
567 | dev_kfree_skb_any(skb); | 567 | dev_kfree_skb_any(skb); |
568 | return iraw_skb; | 568 | return iraw_skb; |