openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfp: use unsigned int for vector/ring counts 

Use unsigned int consistently for vector/ring counts.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2016-10-31 20:43:19 +00:00 committed by David S. Miller
parent 23a4e389bd
commit a4b562bb8e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/netronome/nfp/nfp_net.h
View File

@ -528,11 +528,11 @@ struct nfp_net {
struct timer_list rx_filter_stats_timer; struct timer_list rx_filter_stats_timer;
spinlock_t rx_filter_lock; spinlock_t rx_filter_lock;
int max_tx_rings; unsigned int max_tx_rings;
int max_rx_rings; unsigned int max_rx_rings;
int num_tx_rings; unsigned int num_tx_rings;
int num_rx_rings; unsigned int num_rx_rings;
int stride_tx; int stride_tx;
int stride_rx; int stride_rx;
@ -540,8 +540,8 @@ struct nfp_net {
int txd_cnt; int txd_cnt;
int rxd_cnt; int rxd_cnt;
u8 num_irqs; unsigned int num_irqs;
u8 num_r_vecs; unsigned int num_r_vecs;
struct nfp_net_r_vector r_vecs[NFP_NET_MAX_R_VECS]; struct nfp_net_r_vector r_vecs[NFP_NET_MAX_R_VECS];
struct msix_entry irq_entries[NFP_NET_MAX_IRQS]; struct msix_entry irq_entries[NFP_NET_MAX_IRQS];
@ -757,8 +757,9 @@ extern const char nfp_net_driver_version[];
void nfp_net_get_fw_version(struct nfp_net_fw_version *fw_ver, void nfp_net_get_fw_version(struct nfp_net_fw_version *fw_ver,
void __iomem *ctrl_bar); void __iomem *ctrl_bar);
struct nfp_net *nfp_net_netdev_alloc(struct pci_dev *pdev, struct nfp_net *
int max_tx_rings, int max_rx_rings); nfp_net_netdev_alloc(struct pci_dev *pdev,
unsigned int max_tx_rings, unsigned int max_rx_rings);
void nfp_net_netdev_free(struct nfp_net *nn); void nfp_net_netdev_free(struct nfp_net *nn);
int nfp_net_netdev_init(struct net_device *netdev); int nfp_net_netdev_init(struct net_device *netdev);
void nfp_net_netdev_clean(struct net_device *netdev); void nfp_net_netdev_clean(struct net_device *netdev);

5
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
View File

@ -318,8 +318,8 @@ static int nfp_net_msix_alloc(struct nfp_net *nn, int nr_vecs)
*/ */
static int nfp_net_irqs_wanted(struct nfp_net *nn) static int nfp_net_irqs_wanted(struct nfp_net *nn)
{ {
unsigned int vecs;
int ncpus; int ncpus;
int vecs;
ncpus = num_online_cpus(); ncpus = num_online_cpus();
@ -2701,7 +2701,8 @@ void nfp_net_info(struct nfp_net *nn)
* Return: NFP Net device structure, or ERR_PTR on error. * Return: NFP Net device structure, or ERR_PTR on error.
*/ */
struct nfp_net *nfp_net_netdev_alloc(struct pci_dev *pdev, struct nfp_net *nfp_net_netdev_alloc(struct pci_dev *pdev,
int max_tx_rings, int max_rx_rings) unsigned int max_tx_rings,
unsigned int max_rx_rings)
{ {
struct net_device *netdev; struct net_device *netdev;
struct nfp_net *nn; struct nfp_net *nn;