diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:37 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:37 +0800 |
commit | 510d0a3f869611dcd001a2b7627fa5dded4579af (patch) | |
tree | ba06ce27af2f3aa194a268e3f26f0665c21357a9 /drivers/net/ethernet/mellanox/mlx4/en_rx.c | |
parent | e37ddf27108a992e191b27df9bd532cb9157dc89 (diff) | |
parent | 544ec5b08d007f184ab97abdbed87e613c8c0b83 (diff) |
Merge tag 'v4.4.11' into linux-linaro-lsk-v4.4lsk-v4.4-16.05
This is the 4.4.11 stable release
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_rx.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index e7a5000aa12c..bbff8ec6713e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -704,7 +704,7 @@ static int get_fixed_ipv6_csum(__wsum hw_checksum, struct sk_buff *skb, if (ipv6h->nexthdr == IPPROTO_FRAGMENT || ipv6h->nexthdr == IPPROTO_HOPOPTS) return -1; - hw_checksum = csum_add(hw_checksum, (__force __wsum)(ipv6h->nexthdr << 8)); + hw_checksum = csum_add(hw_checksum, (__force __wsum)htons(ipv6h->nexthdr)); csum_pseudo_hdr = csum_partial(&ipv6h->saddr, sizeof(ipv6h->saddr) + sizeof(ipv6h->daddr), 0); |