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

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

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2019-08-01

This series for fm10k, by Jake Keller, reduces the scope of local variables
where possible.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4de97b0c df87b8fc

drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2013 - 2019 Intel Corporation. */



#include "fm10k.h"
@@ -36,7 +36,7 @@ static int fm10k_dcbnl_ieee_getets(struct net_device *dev, struct ieee_ets *ets) 
static int fm10k_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets)

{

	u8 num_tc = 0;

	int i, err;

	int i;



	/* verify type and determine num_tcs needed */

	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
@@ -57,7 +57,7 @@ static int fm10k_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets) 


	/* update TC hardware mapping if necessary */

	if (num_tc != netdev_get_num_tc(dev)) {

		err = fm10k_setup_tc(dev, num_tc);

		int err = fm10k_setup_tc(dev, num_tc);

		if (err)

			return err;

	}

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

+4 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2013 - 2019 Intel Corporation. */



#include <linux/vmalloc.h>
@@ -222,7 +222,6 @@ static void __fm10k_add_ethtool_stats(u64 **data, void *pointer, 
				      const unsigned int size)

{

	unsigned int i;

	char *p;



	if (!pointer) {

		/* memory is not zero allocated so we have to clear it */
@@ -232,7 +231,7 @@ static void __fm10k_add_ethtool_stats(u64 **data, void *pointer, 
	}



	for (i = 0; i < size; i++) {

		p = (char *)pointer + stats[i].stat_offset;

		char *p = (char *)pointer + stats[i].stat_offset;



		switch (stats[i].sizeof_stat) {

		case sizeof(u64):
@@ -651,7 +650,6 @@ static int fm10k_set_coalesce(struct net_device *dev, 
			      struct ethtool_coalesce *ec)

{

	struct fm10k_intfc *interface = netdev_priv(dev);

	struct fm10k_q_vector *qv;

	u16 tx_itr, rx_itr;

	int i;
@@ -677,7 +675,8 @@ static int fm10k_set_coalesce(struct net_device *dev, 


	/* update q_vectors */

	for (i = 0; i < interface->num_q_vectors; i++) {

		qv = interface->q_vector[i];

		struct fm10k_q_vector *qv = interface->q_vector[i];



		qv->tx.itr = tx_itr;

		qv->rx.itr = rx_itr;

	}

drivers/net/ethernet/intel/fm10k/fm10k_iov.c

+3 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2013 - 2019 Intel Corporation. */



#include "fm10k.h"

#include "fm10k_vf.h"
@@ -426,7 +426,7 @@ static s32 fm10k_iov_alloc_data(struct pci_dev *pdev, int num_vfs) 
	struct fm10k_iov_data *iov_data = interface->iov_data;

	struct fm10k_hw *hw = &interface->hw;

	size_t size;

	int i, err;

	int i;



	/* return error if iov_data is already populated */

	if (iov_data)
@@ -452,6 +452,7 @@ static s32 fm10k_iov_alloc_data(struct pci_dev *pdev, int num_vfs) 
	/* loop through vf_info structures initializing each entry */

	for (i = 0; i < num_vfs; i++) {

		struct fm10k_vf_info *vf_info = &iov_data->vf_info[i];

		int err;



		/* Record VF VSI value */

		vf_info->vsi = i + 1;

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+5 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */

/* Copyright(c) 2013 - 2019 Intel Corporation. */



#include <linux/types.h>

#include <linux/module.h>
@@ -17,7 +17,7 @@ const char fm10k_driver_version[] = DRV_VERSION; 
char fm10k_driver_name[] = "fm10k";

static const char fm10k_driver_string[] = DRV_SUMMARY;

static const char fm10k_copyright[] =

	"Copyright(c) 2013 - 2018 Intel Corporation.";

	"Copyright(c) 2013 - 2019 Intel Corporation.";



MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");

MODULE_DESCRIPTION(DRV_SUMMARY);
@@ -1870,7 +1870,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface) 
static bool fm10k_cache_ring_qos(struct fm10k_intfc *interface)

{

	struct net_device *dev = interface->netdev;

	int pc, offset, rss_i, i, q_idx;

	int pc, offset, rss_i, i;

	u16 pc_stride = interface->ring_feature[RING_F_QOS].mask + 1;

	u8 num_pcs = netdev_get_num_tc(dev);
@@ -1880,7 +1880,8 @@ static bool fm10k_cache_ring_qos(struct fm10k_intfc *interface) 
	rss_i = interface->ring_feature[RING_F_RSS].indices;



	for (pc = 0, offset = 0; pc < num_pcs; pc++, offset += rss_i) {

		q_idx = pc;

		int q_idx = pc;



		for (i = 0; i < rss_i; i++) {

			interface->tx_ring[offset + i]->reg_idx = q_idx;

			interface->tx_ring[offset + i]->qos_pc = pc;

drivers/net/ethernet/intel/fm10k/fm10k_mbx.c

+4 −2
Original line number Diff line number Diff line
@@ -297,13 +297,14 @@ static u16 fm10k_mbx_validate_msg_size(struct fm10k_mbx_info *mbx, u16 len) 
{

	struct fm10k_mbx_fifo *fifo = &mbx->rx;

	u16 total_len = 0, msg_len;

	u32 *msg;



	/* length should include previous amounts pushed */

	len += mbx->pushed;



	/* offset in message is based off of current message size */

	do {

		u32 *msg;



		msg = fifo->buffer + fm10k_fifo_tail_offset(fifo, total_len);

		msg_len = FM10K_TLV_DWORD_LEN(*msg);

		total_len += msg_len;
@@ -1920,7 +1921,6 @@ static void fm10k_sm_mbx_transmit(struct fm10k_hw *hw, 
	/* reduce length by 1 to convert to a mask */

	u16 mbmem_len = mbx->mbmem_len - 1;

	u16 tail_len, len = 0;

	u32 *msg;



	/* push head behind tail */

	if (mbx->tail < head)
@@ -1930,6 +1930,8 @@ static void fm10k_sm_mbx_transmit(struct fm10k_hw *hw, 


	/* determine msg aligned offset for end of buffer */

	do {

		u32 *msg;



		msg = fifo->buffer + fm10k_fifo_head_offset(fifo, len);

		tail_len = len;

		len += FM10K_TLV_DWORD_LEN(*msg);