diff options
| author | Alexander Duyck | 2010-11-17 04:26:54 +0100 |
|---|---|---|
| committer | Jeff Kirsher | 2010-11-17 04:26:54 +0100 |
| commit | c60fbb00f0400792adf873dbacd431885653b77d (patch) | |
| tree | 69ef3142e40a97afca11aa13cfcdc026f7e4c63b /drivers/net/ixgbe/ixgbe_sriov.c | |
| parent | ixgbe: remove residual code left over from earlier combining of TXDCTL (diff) | |
| download | kernel-qcow2-linux-c60fbb00f0400792adf873dbacd431885653b77d.tar.gz kernel-qcow2-linux-c60fbb00f0400792adf873dbacd431885653b77d.tar.xz kernel-qcow2-linux-c60fbb00f0400792adf873dbacd431885653b77d.zip | |
ixgbe: move adapter into pci_dev driver data instead of netdev
This change moves an adapter pointer into the private portion of the
pci_dev instead of a pointer to the netdev. The reason for this change is
because in most cases we just want the adapter anyway. In addition as we
start moving toward multiple netdevs per port we may want to move the
adapter pointer out of the netdevs entirely.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_sriov.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_sriov.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c index 93f40bcf683c..6e3e94b5a5f6 100644 --- a/drivers/net/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ixgbe/ixgbe_sriov.c @@ -178,8 +178,7 @@ static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter, int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask) { unsigned char vf_mac_addr[6]; - struct net_device *netdev = pci_get_drvdata(pdev); - struct ixgbe_adapter *adapter = netdev_priv(netdev); + struct ixgbe_adapter *adapter = pci_get_drvdata(pdev); unsigned int vfn = (event_mask & 0x3f); bool enable = ((event_mask & 0x10000000U) != 0); |