lkml.org 
[lkml]   [2019]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 net-next 12/15] net: sgi: ioc3-eth: use csum_fold
    Date
    replace open coded checksum folding by csum_fold.

    Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
    ---
    drivers/net/ethernet/sgi/ioc3-eth.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
    index ed8f997a3cec..05f4b598114c 100644
    --- a/drivers/net/ethernet/sgi/ioc3-eth.c
    +++ b/drivers/net/ethernet/sgi/ioc3-eth.c
    @@ -1391,16 +1391,12 @@ static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
    /* Sum up dest addr, src addr and protocol */
    ehsum = eh[0] + eh[1] + eh[2] + eh[3] + eh[4] + eh[5] + eh[6];

    - /* Fold ehsum. can't use csum_fold which negates also ... */
    - ehsum = (ehsum & 0xffff) + (ehsum >> 16);
    - ehsum = (ehsum & 0xffff) + (ehsum >> 16);
    -
    /* Skip IP header; it's sum is always zero and was
    * already filled in by ip_output.c
    */
    csum = csum_tcpudp_nofold(ih->saddr, ih->daddr,
    ih->tot_len - (ih->ihl << 2),
    - proto, 0xffff ^ ehsum);
    + proto, csum_fold(ehsum));

    csum = (csum & 0xffff) + (csum >> 16); /* Fold again */
    csum = (csum & 0xffff) + (csum >> 16);
    --
    2.13.7
    \
     
     \ /
      Last update: 2019-08-30 11:27    [W:5.362 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site