diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-06-20 13:30:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-20 13:30:16 -0400 |
| commit | c0ca9e7201c4507e70c4d71c1997c410651fe3c5 (patch) | |
| tree | fda132505741ee4d859ae09f45966656ea557572 /drivers/staging/octeon/ethernet-tx.c | |
| parent | net: dsa: mv88e6xxx: better IEEE Prio Mapping Table description (diff) | |
| parent | net: manual clean code which call skb_put_[data:zero] (diff) | |
| download | linux-dev-c0ca9e7201c4507e70c4d71c1997c410651fe3c5.tar.xz linux-dev-c0ca9e7201c4507e70c4d71c1997c410651fe3c5.zip | |
Merge branch 'net-more-skb_put-work'
yuan linyu says:
====================
net: more skb_put_[data:zero] related work
yuan linyu (3):
net: introduce __skb_put_[zero, data, u8]
net: replace more place to skb_put_[data:zero]
net: manual clean code which call skb_put_[data:zero]
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/octeon/ethernet-tx.c')
| -rw-r--r-- | drivers/staging/octeon/ethernet-tx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index ff4119e8de42..31f35025d19e 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -251,8 +251,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) if ((skb_tail_pointer(skb) + add_bytes) <= skb_end_pointer(skb)) - memset(__skb_put(skb, add_bytes), 0, - add_bytes); + __skb_put_zero(skb, add_bytes); } } } |