p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

emulex: Use skb_put_padto instead of skb_padto() and skb->len assignment 

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2014-12-03 08:17:46 -08:00 committed by David S. Miller
parent a94d9e224e
commit 74b6939de3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/emulex/benet/be_main.c
View File

@ -1017,9 +1017,8 @@ static struct sk_buff *be_xmit_workarounds(struct be_adapter *adapter,
* to pad short packets (<= 32 bytes) to a 36-byte length. * to pad short packets (<= 32 bytes) to a 36-byte length.
*/ */
if (unlikely(!BEx_chip(adapter) && skb->len <= 32)) { if (unlikely(!BEx_chip(adapter) && skb->len <= 32)) {
if (skb_padto(skb, 36)) if (skb_put_padto(skb, 36))
return NULL; return NULL;
skb->len = 36;
} }
if (BEx_chip(adapter) || lancer_chip(adapter)) { if (BEx_chip(adapter) || lancer_chip(adapter)) {