diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-05-09 19:06:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:36 -0400 |
commit | 727ae3032519e56a3b35e44baa96125ee240dd70 (patch) | |
tree | be43327ed90ba6a48c5cb423aadca4bedbaccdce /drivers/staging/rtl8187se | |
parent | 5f546031b6be34285ee9fe6c5bcc9e12e6a9240d (diff) |
Staging: rtl8187se: convert to net_device_ops
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se')
-rw-r--r-- | drivers/staging/rtl8187se/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_module.c | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/r8180_core.c | 25 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/r8180_pm.c | 6 |
4 files changed, 20 insertions, 14 deletions
diff --git a/drivers/staging/rtl8187se/Kconfig b/drivers/staging/rtl8187se/Kconfig index f636296b54b..236e4272544 100644 --- a/drivers/staging/rtl8187se/Kconfig +++ b/drivers/staging/rtl8187se/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config RTL8187SE | 1 | config RTL8187SE |
2 | tristate "RealTek RTL8187SE Wireless LAN NIC driver" | 2 | tristate "RealTek RTL8187SE Wireless LAN NIC driver" |
3 | depends on PCI | 3 | depends on PCI |
4 | depends on WIRELESS_EXT && COMPAT_NET_DEV_OPS | 4 | depends on WIRELESS_EXT |
5 | default N | 5 | default N |
6 | ---help--- | 6 | ---help--- |
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c index 0c9fef0b4e3..c2b61e648e4 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c | |||
@@ -114,7 +114,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv) | |||
114 | goto failed; | 114 | goto failed; |
115 | } | 115 | } |
116 | ieee = netdev_priv(dev); | 116 | ieee = netdev_priv(dev); |
117 | dev->hard_start_xmit = ieee80211_xmit; | ||
118 | 117 | ||
119 | ieee->dev = dev; | 118 | ieee->dev = dev; |
120 | 119 | ||
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index e10413cee0d..7e2fecae813 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c | |||
@@ -198,7 +198,8 @@ static void __devexit rtl8180_pci_remove(struct pci_dev *pdev); | |||
198 | static void rtl8180_shutdown (struct pci_dev *pdev) | 198 | static void rtl8180_shutdown (struct pci_dev *pdev) |
199 | { | 199 | { |
200 | struct net_device *dev = pci_get_drvdata(pdev); | 200 | struct net_device *dev = pci_get_drvdata(pdev); |
201 | dev->stop(dev); | 201 | if (dev->netdev_ops->ndo_stop) |
202 | dev->netdev_ops->ndo_stop(dev); | ||
202 | pci_disable_device(pdev); | 203 | pci_disable_device(pdev); |
203 | } | 204 | } |
204 | 205 | ||
@@ -4551,8 +4552,6 @@ short rtl8180_init(struct net_device *dev) | |||
4551 | //DMESG("Reported EEPROM chip is a 93c46 (1Kbit)"); | 4552 | //DMESG("Reported EEPROM chip is a 93c46 (1Kbit)"); |
4552 | } | 4553 | } |
4553 | 4554 | ||
4554 | dev->get_stats = rtl8180_stats; | ||
4555 | |||
4556 | dev->dev_addr[0]=eprom_read(dev,MAC_ADR) & 0xff; | 4555 | dev->dev_addr[0]=eprom_read(dev,MAC_ADR) & 0xff; |
4557 | dev->dev_addr[1]=(eprom_read(dev,MAC_ADR) & 0xff00)>>8; | 4556 | dev->dev_addr[1]=(eprom_read(dev,MAC_ADR) & 0xff00)>>8; |
4558 | dev->dev_addr[2]=eprom_read(dev,MAC_ADR+1) & 0xff; | 4557 | dev->dev_addr[2]=eprom_read(dev,MAC_ADR+1) & 0xff; |
@@ -5832,6 +5831,18 @@ int rtl8180_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
5832 | -----------------------------PCI STUFF--------------------------- | 5831 | -----------------------------PCI STUFF--------------------------- |
5833 | *****************************************************************************/ | 5832 | *****************************************************************************/ |
5834 | 5833 | ||
5834 | static const struct net_device_ops rtl8180_netdev_ops = { | ||
5835 | .ndo_open = rtl8180_open, | ||
5836 | .ndo_stop = rtl8180_close, | ||
5837 | .ndo_get_stats = rtl8180_stats, | ||
5838 | .ndo_tx_timeout = rtl8180_restart, | ||
5839 | .ndo_do_ioctl = rtl8180_ioctl, | ||
5840 | .ndo_set_multicast_list = r8180_set_multicast, | ||
5841 | .ndo_set_mac_address = r8180_set_mac_adr, | ||
5842 | .ndo_validate_addr = eth_validate_addr, | ||
5843 | .ndo_change_mtu = eth_change_mtu, | ||
5844 | .ndo_start_xmit = ieee80211_xmit, | ||
5845 | }; | ||
5835 | 5846 | ||
5836 | static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, | 5847 | static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, |
5837 | const struct pci_device_id *id) | 5848 | const struct pci_device_id *id) |
@@ -5936,14 +5947,8 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, | |||
5936 | dev->irq = pdev->irq; | 5947 | dev->irq = pdev->irq; |
5937 | priv->irq = 0; | 5948 | priv->irq = 0; |
5938 | 5949 | ||
5939 | dev->open = rtl8180_open; | 5950 | dev->netdev_ops = &rtl8180_netdev_ops; |
5940 | dev->stop = rtl8180_close; | ||
5941 | //dev->hard_start_xmit = ieee80211_xmit; | ||
5942 | dev->tx_timeout = rtl8180_restart; | ||
5943 | dev->wireless_handlers = &r8180_wx_handlers_def; | 5951 | dev->wireless_handlers = &r8180_wx_handlers_def; |
5944 | dev->do_ioctl = rtl8180_ioctl; | ||
5945 | dev->set_multicast_list = r8180_set_multicast; | ||
5946 | dev->set_mac_address = r8180_set_mac_adr; | ||
5947 | 5952 | ||
5948 | #if WIRELESS_EXT >= 12 | 5953 | #if WIRELESS_EXT >= 12 |
5949 | #if WIRELESS_EXT < 17 | 5954 | #if WIRELESS_EXT < 17 |
diff --git a/drivers/staging/rtl8187se/r8180_pm.c b/drivers/staging/rtl8187se/r8180_pm.c index 3851b936835..2b3d642db77 100644 --- a/drivers/staging/rtl8187se/r8180_pm.c +++ b/drivers/staging/rtl8187se/r8180_pm.c | |||
@@ -30,7 +30,8 @@ int rtl8180_suspend (struct pci_dev *pdev, pm_message_t state) | |||
30 | if (!netif_running(dev)) | 30 | if (!netif_running(dev)) |
31 | goto out_pci_suspend; | 31 | goto out_pci_suspend; |
32 | 32 | ||
33 | dev->stop(dev); | 33 | if (dev->netdev_ops->ndo_stop) |
34 | dev->netdev_ops->ndo_stop(dev); | ||
34 | 35 | ||
35 | netif_device_detach(dev); | 36 | netif_device_detach(dev); |
36 | 37 | ||
@@ -71,7 +72,8 @@ int rtl8180_resume (struct pci_dev *pdev) | |||
71 | if(!netif_running(dev)) | 72 | if(!netif_running(dev)) |
72 | goto out; | 73 | goto out; |
73 | 74 | ||
74 | dev->open(dev); | 75 | if (dev->netdev_ops->ndo_open) |
76 | dev->netdev_ops->ndo_open(dev); | ||
75 | netif_device_attach(dev); | 77 | netif_device_attach(dev); |
76 | out: | 78 | out: |
77 | return 0; | 79 | return 0; |