Re: [PATCH v2 5/6] myri10ge: use eth_skb_pad helper
From: Sergei Shtylyov <hidden>
Date: 2014-12-03 18:56:58
Hello. On 12/03/2014 07:17 PM, Alexander Duyck wrote:
Update myri10ge to use eth_skb_pad helper. This also corrects a minor issue as the driver was updating length without updating the tail pointer.
Cc: Hyong-Youb Kim <redacted> Signed-off-by: Alexander Duyck <redacted> --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 9e7e3f1..af09905 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c@@ -2913,16 +2913,11 @@ again: flags |= MXGEFW_FLAGS_SMALL; /* pad frames to at least ETH_ZLEN bytes */ - if (unlikely(skb->len < ETH_ZLEN)) { - if (skb_padto(skb, ETH_ZLEN)) { - /* The packet is gone, so we must - * return 0 */ - ss->stats.tx_dropped += 1; - return NETDEV_TX_OK; - } - /* adjust the len to account for the zero pad - * so that the nic can know how long it is */ - skb->len = ETH_ZLEN; + if (eth_skb_pad(skb)) { + /* The packet is gone, so we must + * return 0 */
Time to fix the comment style, perhaps? The preferred one for the
networking code is:
/* bla
* bla
*/
+ ss->stats.tx_dropped += 1;
Hm, why not 'ss->stats.tx_dropped++'?
+ return NETDEV_TX_OK; } }
WBR, Sergei