lkml.org 
[lkml]   [2017]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 041/109] net: systemport: Utilize skb_put_padto()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Fainelli <f.fainelli@gmail.com>


    [ Upstream commit bb7da333d0a9f3bddc08f84187b7579a3f68fd24 ]

    Since we need to pad our packets, utilize skb_put_padto() which
    increases skb->len by how much we need to pad, allowing us to eliminate
    the test on skb->len right below.

    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/bcmsysport.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/broadcom/bcmsysport.c
    +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
    @@ -1039,13 +1039,12 @@ static netdev_tx_t bcm_sysport_xmit(stru
    * (including FCS and tag) because the length verification is done after
    * the Broadcom tag is stripped off the ingress packet.
    */
    - if (skb_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {
    + if (skb_put_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {
    ret = NETDEV_TX_OK;
    goto out;
    }

    - skb_len = skb->len < ETH_ZLEN + ENET_BRCM_TAG_LEN ?
    - ETH_ZLEN + ENET_BRCM_TAG_LEN : skb->len;
    + skb_len = skb->len;

    mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);
    if (dma_mapping_error(kdev, mapping)) {

    \
     
     \ /
      Last update: 2017-12-07 14:00    [W:4.187 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site