ixgbe: move adapter into pci_dev driver data instead of netdev

[net-next-2.6.git] / drivers / net / ixgbe / ixgbe_sriov.c

diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index 5428153af8f31a83ca56d2beb8dea42b121d6462..6e3e94b5a5f6273f704ed7d87695aa4436d34be1 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -68,7 +68,7 @@ static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
         * addresses
         */
        for (i = 0; i < entries; i++) {
-               vfinfo->vf_mc_hashes[i] = hash_list[i];;
+               vfinfo->vf_mc_hashes[i] = hash_list[i];
        }
 
        for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
@@ -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);