Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / ethernet / intel / i40e / i40e_main.c

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index d9f4972..eddec6b 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -4415,13 +4415,13 @@ static void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
 
        switch (vsi->back->hw.phy.link_info.link_speed) {
        case I40E_LINK_SPEED_40GB:
-               strncpy(speed, "40 Gbps", SPEED_SIZE);
+               strlcpy(speed, "40 Gbps", SPEED_SIZE);
                break;
        case I40E_LINK_SPEED_10GB:
-               strncpy(speed, "10 Gbps", SPEED_SIZE);
+               strlcpy(speed, "10 Gbps", SPEED_SIZE);
                break;
        case I40E_LINK_SPEED_1GB:
-               strncpy(speed, "1000 Mbps", SPEED_SIZE);
+               strlcpy(speed, "1000 Mbps", SPEED_SIZE);
                break;
        default:
                break;
@@ -4429,16 +4429,16 @@ static void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
 
        switch (vsi->back->hw.fc.current_mode) {
        case I40E_FC_FULL:
-               strncpy(fc, "RX/TX", FC_SIZE);
+               strlcpy(fc, "RX/TX", FC_SIZE);
                break;
        case I40E_FC_TX_PAUSE:
-               strncpy(fc, "TX", FC_SIZE);
+               strlcpy(fc, "TX", FC_SIZE);
                break;
        case I40E_FC_RX_PAUSE:
-               strncpy(fc, "RX", FC_SIZE);
+               strlcpy(fc, "RX", FC_SIZE);
                break;
        default:
-               strncpy(fc, "None", FC_SIZE);
+               strlcpy(fc, "None", FC_SIZE);
                break;
        }
 
@@ -5839,7 +5839,7 @@ static void i40e_send_version(struct i40e_pf *pf)
        dv.minor_version = DRV_VERSION_MINOR;
        dv.build_version = DRV_VERSION_BUILD;
        dv.subbuild_version = 0;
-       strncpy(dv.driver_string, DRV_VERSION, sizeof(dv.driver_string));
+       strlcpy(dv.driver_string, DRV_VERSION, sizeof(dv.driver_string));
        i40e_aq_send_driver_version(&pf->hw, &dv, NULL);
 }
 
@@ -6293,7 +6293,7 @@ static int i40e_vsi_alloc_arrays(struct i40e_vsi *vsi, bool alloc_qvectors)
 
        if (alloc_qvectors) {
                /* allocate memory for q_vector pointers */
-               size = sizeof(struct i40e_q_vectors *) * vsi->num_q_vectors;
+               size = sizeof(struct i40e_q_vector *) * vsi->num_q_vectors;
                vsi->q_vectors = kzalloc(size, GFP_KERNEL);
                if (!vsi->q_vectors) {
                        ret = -ENOMEM;