diff -Naur rtl8185_linux_26.1030.0625.2009.release.mod/ieee80211/ieee80211_module.c rtl8185_linux_26.1030.0625.2009.release/ieee80211/ieee80211_module.c --- rtl8185_linux_26.1030.0625.2009.release.mod/ieee80211/ieee80211_module.c 2009-11-11 02:01:00.000000000 +0100 +++ rtl8185_linux_26.1030.0625.2009.release/ieee80211/ieee80211_module.c 2009-06-26 16:14:16.000000000 +0200 @@ -101,10 +101,6 @@ list_add_tail(&ieee->networks[i].list, &ieee->network_free_list); } -static const struct net_device_ops ieee80211_netDeviceOps = -{ - .ndo_start_xmit = ieee80211_xmit, -}; struct net_device *alloc_ieee80211(int sizeof_priv) { @@ -124,7 +120,7 @@ #else ieee = (struct ieee80211_device *)dev->priv; #endif - dev->netdev_ops = &ieee80211_netDeviceOps; + dev->hard_start_xmit = ieee80211_xmit; ieee->dev = dev; diff -Naur rtl8185_linux_26.1030.0625.2009.release.mod/rtl8185/r8180_core.c rtl8185_linux_26.1030.0625.2009.release/rtl8185/r8180_core.c --- rtl8185_linux_26.1030.0625.2009.release.mod/rtl8185/r8180_core.c 2009-11-11 02:03:17.000000000 +0100 +++ rtl8185_linux_26.1030.0625.2009.release/rtl8185/r8180_core.c 2009-06-26 16:14:16.000000000 +0200 @@ -2778,11 +2778,6 @@ void rtl8180_restart_wq(struct work_struct *work); #endif -static const struct net_device_ops rtl8180_netDeviceOps2 = -{ - .ndo_get_stats = rtl8180_stats, -}; - short rtl8180_init(struct net_device *dev) { @@ -2966,7 +2961,7 @@ DMESG("Reported EEPROM chip is a 93c46 (1Kbit)"); } - dev->netdev_ops = &rtl8180_netDeviceOps2; + dev->get_stats = rtl8180_stats; chan_plan_index = eprom_read(dev,EPROM_CHANNEL_PLAN) & 0xff; if(chan_plan_index & 0x80) { chan_plan_index &= 0x7f; @@ -3809,16 +3804,6 @@ -----------------------------PCI STUFF--------------------------- *****************************************************************************/ -static const struct net_device_ops rtl8180_netDeviceOps = -{ - .ndo_open = rtl8180_open, - .ndo_stop = rtl8180_close, - .ndo_tx_timeout = rtl8180_restart, - .ndo_do_ioctl = rtl8180_ioctl, - .ndo_set_multicast_list = r8180_set_multicast, - .ndo_set_mac_address = r8180_set_mac_adr, -}; - static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) @@ -3919,8 +3904,13 @@ dev->irq = pdev->irq; priv->irq = 0; + dev->open = rtl8180_open; + dev->stop = rtl8180_close; + dev->tx_timeout = rtl8180_restart; dev->wireless_handlers = &r8180_wx_handlers_def; - dev->netdev_ops = &rtl8180_netDeviceOps; + dev->do_ioctl = rtl8180_ioctl; + dev->set_multicast_list = r8180_set_multicast; + dev->set_mac_address = r8180_set_mac_adr; #if WIRELESS_EXT >= 12 #if WIRELESS_EXT < 17 dev->get_wireless_stats = r8180_get_wireless_stats; diff -Naur rtl8185_linux_26.1030.0625.2009.release.mod/rtl8185/r8180_pm.c rtl8185_linux_26.1030.0625.2009.release/rtl8185/r8180_pm.c --- rtl8185_linux_26.1030.0625.2009.release.mod/rtl8185/r8180_pm.c 2009-11-11 02:04:41.000000000 +0100 +++ rtl8185_linux_26.1030.0625.2009.release/rtl8185/r8180_pm.c 2009-06-26 16:14:16.000000000 +0200 @@ -42,8 +42,7 @@ if (!netif_running(dev)) goto out_pci_suspend; - if (dev->netdev_ops->ndo_stop) - dev->netdev_ops->ndo_stop(dev); + dev->stop(dev); netif_device_detach(dev); @@ -78,8 +77,7 @@ if(!netif_running(dev)) goto out; - if (dev->netdev_ops->ndo_open) - dev->netdev_ops->ndo_open(dev); + dev->open(dev); netif_device_attach(dev); out: return 0;