diff options
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 84978f80f396..86379fdd8b0e 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -537,7 +537,7 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter, | |||
537 | static int nx_p3_sre_macaddr_change(struct net_device *dev, | 537 | static int nx_p3_sre_macaddr_change(struct net_device *dev, |
538 | u8 *addr, unsigned op) | 538 | u8 *addr, unsigned op) |
539 | { | 539 | { |
540 | struct netxen_adapter *adapter = (struct netxen_adapter *)dev->priv; | 540 | struct netxen_adapter *adapter = netdev_priv(dev); |
541 | nx_nic_req_t req; | 541 | nx_nic_req_t req; |
542 | nx_mac_req_t mac_req; | 542 | nx_mac_req_t mac_req; |
543 | int rv; | 543 | int rv; |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 33caca90e80c..25bfb3acf5e4 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -541,7 +541,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
541 | 541 | ||
542 | SET_NETDEV_DEV(netdev, &pdev->dev); | 542 | SET_NETDEV_DEV(netdev, &pdev->dev); |
543 | 543 | ||
544 | adapter = netdev->priv; | 544 | adapter = netdev_priv(netdev); |
545 | adapter->netdev = netdev; | 545 | adapter->netdev = netdev; |
546 | adapter->pdev = pdev; | 546 | adapter->pdev = pdev; |
547 | adapter->ahw.pci_func = pci_func_id; | 547 | adapter->ahw.pci_func = pci_func_id; |
@@ -986,7 +986,7 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) | |||
986 | */ | 986 | */ |
987 | static int netxen_nic_open(struct net_device *netdev) | 987 | static int netxen_nic_open(struct net_device *netdev) |
988 | { | 988 | { |
989 | struct netxen_adapter *adapter = (struct netxen_adapter *)netdev->priv; | 989 | struct netxen_adapter *adapter = netdev_priv(netdev); |
990 | int err = 0; | 990 | int err = 0; |
991 | int ctx, ring; | 991 | int ctx, ring; |
992 | irq_handler_t handler; | 992 | irq_handler_t handler; |