Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db8d457a authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-08-12

This series contains updates to i40e and e1000e.

Lucas provides a fix for i40e to resolve a compile issue where a header
was missing in the #includes.

Wei Yongjun provides a fix for i40e to resolve a sparse warning, where
a non-static function should be static.

Julia Lawall provides a fix for i40e which was found using Coccinelle,
where there was a typo in the name of the type given to sizeof().

Rickard Strandqvist provides a fix for i40e to replace the use of
strncpy() with strlcpy() to avoid strings that lack null termination.

Jean Sacren provides two e1000e fixes, first is a comment fix and second
removes an excessive space character in a debug message.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a4688132 5e815d84

drivers/net/ethernet/intel/e1000e/manage.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static u8 e1000_calculate_checksum(u8 *buffer, u32 length) 
 *  e1000_mng_enable_host_if - Checks host interface is enabled

 *  @hw: pointer to the HW structure

 *

 *  Returns E1000_success upon success, else E1000_ERR_HOST_INTERFACE_COMMAND

 *  Returns 0 upon success, else -E1000_ERR_HOST_INTERFACE_COMMAND

 *

 *  This function checks whether the HOST IF is enabled for command operation

 *  and also checks whether the previous command is completed.  It busy waits

drivers/net/ethernet/intel/i40e/i40e_fcoe.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <scsi/fc/fc_fcoe.h>

#include <scsi/libfc.h>

#include <scsi/libfcoe.h>

#include <uapi/linux/dcbnl.h>



#include "i40e.h"

#include "i40e_fcoe.h"

drivers/net/ethernet/intel/i40e/i40e_main.c

+9 −9
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/intel/i40e/i40e_nvm.c

+3 −3
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ i40e_status i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset, 
 *

 * Writes a 16 bit words buffer to the Shadow RAM using the admin command.

 **/

i40e_status i40e_write_nvm_aq(struct i40e_hw *hw, u8 module_pointer,

static i40e_status i40e_write_nvm_aq(struct i40e_hw *hw, u8 module_pointer,

				     u32 offset, u16 words, void *data,

				     bool last_command)

{