Commit 7bb37710 authored by Mark Starovoytov's avatar Mark Starovoytov Committed by Jakub Kicinski
Browse files

net: atlantic: minor MACSec code cleanup 



This patch fixes a couple of minor merge issues found in macsec_api.c
after corresponding patch series has been applied.

These are not real bugs, so pushing to net-next.

Signed-off-by: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 38e86bfc

drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c

+3 −3
Original line number Diff line number Diff line
@@ -846,8 +846,7 @@ static int get_ingress_sakey_record(struct aq_hw_s *hw, 
	rec->key[7] = packed_record[14];

	rec->key[7] |= packed_record[15] << 16;



	rec->key_len = (rec->key_len & 0xFFFFFFFC) |

		       (packed_record[16] & 0x3);

	rec->key_len = packed_record[16] & 0x3;



	return 0;

}
@@ -1158,6 +1157,7 @@ static int set_egress_ctlf_record(struct aq_hw_s *hw, 


	packed_record[0] = rec->sa_da[0] & 0xFFFF;

	packed_record[1] = (rec->sa_da[0] >> 16) & 0xFFFF;



	packed_record[2] = rec->sa_da[1] & 0xFFFF;



	packed_record[3] = rec->eth_type & 0xFFFF;
@@ -1552,7 +1552,7 @@ static int set_egress_sc_record(struct aq_hw_s *hw, 


	packed_record[5] |= (rec->sak_len & 0x3) << 4;



	packed_record[7] |= (rec->valid & 0x1) << 15;

	packed_record[7] = (rec->valid & 0x1) << 15;



	return set_raw_egress_record(hw, packed_record, 8, 2,

				     ROWOFFSET_EGRESSSCRECORD + table_index);

CRA Git | Maintained and supported by SUSTech CRA and CCSE