1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 64866ff1aea0..ec1a233622c6 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -865,7 +865,6 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
         }
 
         memcpy(netdev->dev_addr, addr, netdev->addr_len);
-        netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
         return 0;
 }
@@ -1491,7 +1490,8 @@ static int enic_request_intr(struct enic *enic)
 
                 for (i = 0; i < enic->rq_count; i++) {
                         intr = enic_msix_rq_intr(enic, i);
-                        sprintf(enic->msix[intr].devname,
+                        snprintf(enic->msix[intr].devname,
+                                sizeof(enic->msix[intr].devname),
                                 "%.11s-rx-%d", netdev->name, i);
                         enic->msix[intr].isr = enic_isr_msix_rq;
                         enic->msix[intr].devid = &enic->napi[i];
@@ -1499,20 +1499,23 @@ static int enic_request_intr(struct enic *enic)
 
                 for (i = 0; i < enic->wq_count; i++) {
                         intr = enic_msix_wq_intr(enic, i);
-                        sprintf(enic->msix[intr].devname,
+                        snprintf(enic->msix[intr].devname,
+                                sizeof(enic->msix[intr].devname),
                                 "%.11s-tx-%d", netdev->name, i);
                         enic->msix[intr].isr = enic_isr_msix_wq;
                         enic->msix[intr].devid = enic;
                 }
 
                 intr = enic_msix_err_intr(enic);
-                sprintf(enic->msix[intr].devname,
+                snprintf(enic->msix[intr].devname,
+                        sizeof(enic->msix[intr].devname),
                         "%.11s-err", netdev->name);
                 enic->msix[intr].isr = enic_isr_msix_err;
                 enic->msix[intr].devid = enic;
 
                 intr = enic_msix_notify_intr(enic);
-                sprintf(enic->msix[intr].devname,
+                snprintf(enic->msix[intr].devname,
+                        sizeof(enic->msix[intr].devname),
                         "%.11s-notify", netdev->name);
                 enic->msix[intr].isr = enic_isr_msix_notify;
                 enic->msix[intr].devid = enic;