]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
net: atlantic: fix missing | operator when assigning rec->llc
authorColin Ian King <colin.king@canonical.com>
Wed, 1 Apr 2020 23:27:36 +0000 (00:27 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Apr 2020 13:50:59 +0000 (06:50 -0700)
rec->llc is currently being assigned twice, once with the lower 8 bits
from packed_record[8] and then re-assigned afterwards with data from
packed_record[9].  This looks like a type, I believe the second assignment
should be using the |= operator rather than a direct assignment.

Addresses-Coverity: ("Unused value")
Fixes: b8f8a0b7b5cb ("net: atlantic: MACSec ingress offload HW bindings")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Igor Russkikh <irusskikh@marell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c

index 97901c114bfab4253e104ecbcc34163162a341c4..fbe9d88b13c7b2ccc47e74706dc9929614c1a8fb 100644 (file)
@@ -491,7 +491,7 @@ get_ingress_preclass_record(struct aq_hw_s *hw,
        rec->snap[1] = packed_record[8] & 0xFF;
 
        rec->llc = (packed_record[8] >> 8) & 0xFF;
-       rec->llc = packed_record[9] << 8;
+       rec->llc |= packed_record[9] << 8;
 
        rec->mac_sa[0] = packed_record[10];
        rec->mac_sa[0] |= packed_record[11] << 16;