aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@redhat.com>2014-12-03 11:17:46 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-08 20:47:42 -0500
commit74b6939de3aea269627537e5178c973c3f123690 (patch)
treecece6ce8dddb0f017c118e54a755a8d088ea2d32 /drivers/net/ethernet/emulex
parenta94d9e224e3c48f57559183582c6410e7acf1d8b (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/emulex')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index e0ab7673afe7..9461ad8d837b 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1017,9 +1017,8 @@ static struct sk_buff *be_xmit_workarounds(struct be_adapter *adapter,
1017 * to pad short packets (<= 32 bytes) to a 36-byte length. 1017 * to pad short packets (<= 32 bytes) to a 36-byte length.
1018 */ 1018 */
1019 if (unlikely(!BEx_chip(adapter) && skb->len <= 32)) { 1019 if (unlikely(!BEx_chip(adapter) && skb->len <= 32)) {
1020 if (skb_padto(skb, 36)) 1020 if (skb_put_padto(skb, 36))
1021 return NULL; 1021 return NULL;
1022 skb->len = 36;
1023 } 1022 }
1024 1023
1025 if (BEx_chip(adapter) || lancer_chip(adapter)) { 1024 if (BEx_chip(adapter) || lancer_chip(adapter)) {