netdev - Re: [PATCH v2 5/6] myri10ge: use eth_skb

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <547F5CF6.9010904@cogentembedded.com>
Date:	Wed, 03 Dec 2014 21:56:54 +0300
From:	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To:	Alexander Duyck <alexander.h.duyck@...hat.com>,
	netdev@...r.kernel.org
CC:	Hyong-Youb Kim <hykim@...i.com>, davem@...emloft.net
Subject: Re: [PATCH v2 5/6] myri10ge: use eth_skb_pad helper

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 <hykim@...i.com>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@...hat.com>
> ---
>   drivers/net/ethernet/myricom/myri10ge/myri10ge.c |   15 +++++----------
>   1 file changed, 5 insertions(+), 10 deletions(-)

> 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

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html