netdev->netdev_ops = &ixgbe_netdev_ops;
        ixgbe_set_ethtool_ops(netdev);
        netdev->watchdog_timeo = 5 * HZ;
-       strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
+       strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));
 
        adapter->bd_number = cards_found;
 
        }
        ixgbe_check_minimum_link(adapter, expected_gts);
 
-       err = ixgbe_read_pba_string_generic(hw, part_str, IXGBE_PBANUM_LENGTH);
+       err = ixgbe_read_pba_string_generic(hw, part_str, sizeof(part_str));
        if (err)
-               strncpy(part_str, "Unknown", IXGBE_PBANUM_LENGTH);
+               strlcpy(part_str, "Unknown", sizeof(part_str));
        if (ixgbe_is_sfp(hw) && hw->phy.sfp_type != ixgbe_sfp_type_not_present)
                e_dev_info("MAC: %d, PHY: %d, SFP+: %d, PBA No: %s\n",
                           hw->mac.type, hw->phy.type, hw->phy.sfp_type,