diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-02 02:57:40 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-02 02:57:40 +0400 |
| commit | b4017c5368f992fb8fb3a2545a0977082c6664e4 (patch) | |
| tree | b18fee77164297141c988965a9846225f8d8b3d3 /drivers/net/ethernet/cisco | |
| parent | 97767a87f3be8834192dc3fc9412aaccf708d87f (diff) | |
| parent | 413708bbaf5c85c4c8a264145f7d6c3afcd97f99 (diff) | |
| download | linux-b4017c5368f992fb8fb3a2545a0977082c6664e4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/tg3.c
Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cisco')
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic.h | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h index 99998c606d3e..cf1fb4b9a4ad 100644 --- a/drivers/net/ethernet/cisco/enic/enic.h +++ b/drivers/net/ethernet/cisco/enic/enic.h @@ -94,7 +94,7 @@ struct enic { u32 rx_coalesce_usecs; u32 tx_coalesce_usecs; #ifdef CONFIG_PCI_IOV - u32 num_vfs; + u16 num_vfs; #endif struct enic_port_profile *pp; diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index e27ec1d3778d..9080ed651666 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2390,7 +2390,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV); if (pos) { pci_read_config_word(pdev, pos + PCI_SRIOV_TOTAL_VF, - (u16 *)&enic->num_vfs); + &enic->num_vfs); if (enic->num_vfs) { err = pci_enable_sriov(pdev, enic->num_vfs); if (err) { |