diff --git a/drivers/net/ethernet/nvidia/nvethernet/Makefile b/drivers/net/ethernet/nvidia/nvethernet/Makefile
index f19b931e..97a5ab59 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/Makefile
+++ b/drivers/net/ethernet/nvidia/nvethernet/Makefile
@@ -22,7 +22,7 @@ ccflags-y += -DLINUX_IVC -DUPDATED_PAD_CAL \
 	     -I$(srctree.nvidia)/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm/include \
 	     -I$(srctree.nvidia)/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm/osi/common/include
 
-ccflags-y += -DMACSEC_SUPPORT -DNET30 -DMACSEC_DEBUG -DOSI_DEBUG -DHSI_SUPPORT -DLINUX_OS
+ccflags-y += -DMACSEC_SUPPORT -DNET30 -DDEBUG_MACSEC -DOSI_DEBUG -DHSI_SUPPORT -DLINUX_OS
 
 nvethernet-objs:= ether_linux.o \
 		  osd.o \
diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
index 73492a3e..06b944ad 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
@@ -2983,15 +2983,6 @@ static int ether_close(struct net_device *ndev)
 	if (pdata->osi_core->mac == OSI_MAC_HW_MGBE)
 		pm_runtime_put_sync(pdata->dev);
 
-#ifdef MACSEC_SUPPORT
-#ifdef DEBUG_MACSEC
-	ret = macsec_close(pdata->macsec_pdata);
-	if (ret < 0) {
-		dev_err(pdata->dev, "Failed to close macsec");
-	}
-#endif
-#endif /* MACSEC_SUPPORT */
-
 	/* Reset stats since interface is going down */
 	ether_reset_stats(pdata);
 
@@ -4023,12 +4014,6 @@ static int ether_change_mtu(struct net_device *ndev, int new_mtu)
 	/* Macsec is supported, reduce MTU */
 	if ((osi_core->mac == OSI_MAC_HW_EQOS && osi_core->mac_ver == OSI_EQOS_MAC_5_30) ||
 	    (osi_core->mac == OSI_MAC_HW_MGBE && osi_core->mac_ver == OSI_MGBE_MAC_3_10)) {
-		ret = osi_macsec_update_mtu(osi_core, new_mtu);
-		if (ret < 0) {
-			dev_err(pdata->dev, "Failed to set MACSEC MTU to %d\n",
-				 new_mtu);
-			return -EINVAL;
-		}
 		ndev->mtu -= MACSEC_TAG_ICV_LEN;
 		netdev_info(pdata->ndev, "Macsec: Reduced MTU: %d Max: %d\n",
 			    ndev->mtu, ndev->max_mtu);
diff --git a/drivers/net/ethernet/nvidia/nvethernet/macsec.c b/drivers/net/ethernet/nvidia/nvethernet/macsec.c
index 95e3da0a..8e6c9c79 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/macsec.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/macsec.c
@@ -36,7 +36,7 @@ static irqreturn_t macsec_s_isr(int irq, void *data)
 	struct macsec_priv_data *macsec_pdata = (struct macsec_priv_data *)data;
 	struct ether_priv_data *pdata = macsec_pdata->ether_pdata;
 
-	osi_macsec_s_isr(pdata->osi_core);
+	osi_macsec_isr(pdata->osi_core);
 
 	return IRQ_HANDLED;
 }
@@ -98,7 +98,7 @@ static irqreturn_t macsec_ns_isr(int irq, void *data)
 	struct ether_priv_data *pdata = macsec_pdata->ether_pdata;
 	int irq_ret = IRQ_HANDLED;
 
-	osi_macsec_ns_isr(pdata->osi_core);
+	osi_macsec_isr(pdata->osi_core);
 
 #ifdef HSI_SUPPORT
 	if (pdata->osi_core->hsi.enabled == OSI_ENABLE &&
diff --git a/drivers/net/ethernet/nvidia/nvethernet/macsec.h b/drivers/net/ethernet/nvidia/nvethernet/macsec.h
index 32f81caa..cb3ceefe 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/macsec.h
+++ b/drivers/net/ethernet/nvidia/nvethernet/macsec.h
@@ -238,13 +238,13 @@ int macsec_close(struct macsec_priv_data *macsec_pdata);
 int macsec_suspend(struct macsec_priv_data *macsec_pdata);
 int macsec_resume(struct macsec_priv_data *macsec_pdata);
 
-#ifdef MACSEC_DEBUG
+#ifdef DEBUG_MACSEC
 #define PRINT_ENTRY()	(printk(KERN_DEBUG "-->%s()\n", __func__))
 #define PRINT_EXIT()	(printk(KERN_DEBUG "<--%s()\n", __func__))
 #else
 #define PRINT_ENTRY()
 #define PRINT_EXIT()
-#endif /* MACSEC_DEBUG */
+#endif /* DEBUG_MACSEC */
 
 #endif /* INCLUDED_MACSEC_H */
 
diff --git a/drivers/net/ethernet/nvidia/nvethernet/sysfs.c b/drivers/net/ethernet/nvidia/nvethernet/sysfs.c
index 99468c53..c0a0b533 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/sysfs.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/sysfs.c
@@ -337,6 +337,7 @@ static DEVICE_ATTR(macsec_cipher, (S_IRUGO | S_IWUSR),
 		   macsec_cipher_show,
 		   macsec_cipher_store);
 
+#ifdef DEBUG_MACSEC
 /**
  * @brief Shows the current setting of MACsec loopback
  *
@@ -421,6 +422,7 @@ static ssize_t macsec_loopback_store(struct device *dev,
 static DEVICE_ATTR(macsec_loopback, (S_IRUGO | S_IWUSR),
 		   macsec_loopback_show,
 		   macsec_loopback_store);
+#endif /* DEBUG_MACSEC */
 
 #ifdef HSI_SUPPORT
 /**
@@ -1002,7 +1004,7 @@ static DEVICE_ATTR(macsec_mmc_counters, (S_IRUGO | S_IWUSR),
 		   macsec_mmc_counters_show,
 		   NULL);
 
-
+#ifdef DEBUG_MACSEC
 static void dump_dbg_buffers(char **buf_p, unsigned short ctlr_sel,
 			 struct osi_core_priv_data *osi_core)
 {
@@ -1153,6 +1155,7 @@ exit:
 static DEVICE_ATTR(macsec_dbg_events, (S_IRUGO | S_IWUSR),
 		   NULL,
 		   macsec_dbg_events_store);
+#endif /* DEBUG_MACSEC */
 
 /**
  * @brief Shows the current SCI LUT configuration
@@ -2626,11 +2629,13 @@ static struct attribute *ether_sysfs_attrs[] = {
 	&dev_attr_macsec_sa_state_lut.attr,
 	&dev_attr_macsec_sc_param_lut.attr,
 	&dev_attr_macsec_cipher.attr,
-	&dev_attr_macsec_loopback.attr,
 	&dev_attr_macsec_enable.attr,
 	&dev_attr_macsec_mmc_counters.attr,
+#ifdef DEBUG_MACSEC
+	&dev_attr_macsec_loopback.attr,
 	&dev_attr_macsec_dbg_buffers.attr,
 	&dev_attr_macsec_dbg_events.attr,
+#endif /* DEBUG_MACSEC */
 #endif /* MACSEC_SUPPORT */
 	&dev_attr_uphy_gbe_mode.attr,
 	&dev_attr_phy_iface_mode.attr,