diff --git a/drivers/net/ethernet/nvidia/nvethernet/macsec.c b/drivers/net/ethernet/nvidia/nvethernet/macsec.c
index 16ea8868..4953cf7f 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/macsec.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/macsec.c
@@ -715,7 +715,7 @@ static int parse_sa_config(struct nlattr **attrs, struct nlattr **tb_sa,
 		sc_info->lowest_pn = nla_get_u32(tb_sa[NV_MACSEC_SA_ATTR_LOWEST_PN]);
 	}
 #ifdef NVPKCS_MACSEC
-	if (pkcs != NULL) {
+	if (pkcs) {
 		if (tb_sa[NV_MACSEC_SA_PKCS_KEY_WRAP]) {
 			memcpy(pkcs->nv_key,
 				nla_data(tb_sa[NV_MACSEC_SA_PKCS_KEY_WRAP]),
@@ -728,7 +728,7 @@ static int parse_sa_config(struct nlattr **attrs, struct nlattr **tb_sa,
 #else
 	if (tb_sa[NV_MACSEC_SA_ATTR_KEY]) {
 		memcpy(sc_info->sak, nla_data(tb_sa[NV_MACSEC_SA_ATTR_KEY]),
-			sizeof(sc_info->sak));
+		       sizeof(sc_info->sak));
 	}
 #endif /* NVPKCS_MACSEC */
 	return 0;
@@ -1764,7 +1764,7 @@ static int macsec_tz_kt_config(struct ether_priv_data *pdata,
 			   kt_config->table_config.index);
 		nla_put_u32(msg, NV_MACSEC_TZ_ATTR_FLAG, kt_config->flags);
 #ifdef NVPKCS_MACSEC
-		if (pkcs != NULL) {
+		if (pkcs) {
 			nla_put(msg, NV_MACSEC_TZ_PKCS_KEY_WRAP,
 				sizeof(pkcs->nv_key),
 				pkcs->nv_key);
diff --git a/drivers/net/ethernet/nvidia/nvethernet/macsec.h b/drivers/net/ethernet/nvidia/nvethernet/macsec.h
index 9620b176..d972151d 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/macsec.h
+++ b/drivers/net/ethernet/nvidia/nvethernet/macsec.h
@@ -69,7 +69,7 @@
 /* For 128 bit SAK, key len is 16 bytes, wrapped key len is 24 bytes
  * and for 256 SAK, key len is 32 bytes, wrapped key len is 40 bytes
  */
-#define NV_SAK_WRAPPED_LEN 24
+#define NV_SAK_WRAPPED_LEN 40
 /* PKCS KEK CK_OBJECT_HANDLE is u64 type */
 #define NV_KEK_HANDLE_SIZE 8