lkml.org 
[lkml]   [2014]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 52/87] net: mvneta: Fix big endian issue in mvneta_txq_desc_csum()
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Thomas Fitzsimmons <fitzsim@fitzsim.org>

    [ Upstream commit 0a1985879437d14bda8c90d0dae3455c467d7642 ]

    This commit fixes the command value generated for CSUM calculation
    when running in big endian mode. The Ethernet protocol ID for IP was
    being unconditionally byte-swapped in the layer 3 protocol check (with
    swab16), which caused the mvneta driver to not function correctly in
    big endian mode. This patch byte-swaps the ID conditionally with
    htons.

    Cc: <stable@vger.kernel.org> # v3.13+
    Signed-off-by: Thomas Fitzsimmons <fitzsim@fitzsim.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/marvell/mvneta.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/ethernet/marvell/mvneta.c
    +++ b/drivers/net/ethernet/marvell/mvneta.c
    @@ -1217,7 +1217,7 @@ static u32 mvneta_txq_desc_csum(int l3_o
    command = l3_offs << MVNETA_TX_L3_OFF_SHIFT;
    command |= ip_hdr_len << MVNETA_TX_IP_HLEN_SHIFT;

    - if (l3_proto == swab16(ETH_P_IP))
    + if (l3_proto == htons(ETH_P_IP))
    command |= MVNETA_TXD_IP_CSUM;
    else
    command |= MVNETA_TX_L3_IP6;



    \
     
     \ /
      Last update: 2014-07-26 23:01    [W:4.200 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site