[PATCH -next 1/3] ipw2x00: remove old compat_net_dev_ops code

[PATCH -next 1/3] ipw2x00: remove old compat_net_dev_ops code

[Alexander Beregalov]

Since both ipw2100 and ipw2200 are already converted to new
net_device_ops this code is useless.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/net/wireless/ipw2x00/libipw_module.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index 92a2692..8ce6e96 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -154,10 +154,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
 		goto failed;
 	}
 	ieee = netdev_priv(dev);
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-	dev->hard_start_xmit = ieee80211_xmit;
-	dev->change_mtu = ieee80211_change_mtu;
-#endif
 
 	ieee->dev = dev;
 
-- 
1.6.2.3

[PATCH -next 2/3] usbnet: remove old compat_net_dev_ops code

[Alexander Beregalov]

Since all usb network drivers are already converted to net_device_ops
this code is useless.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/net/usb/usbnet.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index f3a2fce..2b8b903 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1185,12 +1185,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 #endif
 
 	net->netdev_ops = &usbnet_netdev_ops;
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-	net->hard_start_xmit = usbnet_start_xmit;
-	net->open = usbnet_open;
-	net->stop = usbnet_stop;
-	net->tx_timeout = usbnet_tx_timeout;
-#endif
 	net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
 	net->ethtool_ops = &usbnet_ethtool_ops;
 
-- 
1.6.2.3

[PATCH -next 3/3] 8390(p): remove old compat_net_dev_ops code

[Alexander Beregalov]

Remove compat_net_dev_ops code and use struct net_device_ops
instead of it.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/net/8390.c  |   10 ++--------
 drivers/net/8390p.c |   10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index ec3e22e..21153de 100644
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -74,14 +74,8 @@ EXPORT_SYMBOL(ei_netdev_ops);
 struct net_device *__alloc_ei_netdev(int size)
 {
 	struct net_device *dev = ____alloc_ei_netdev(size);
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-	if (dev) {
-		dev->hard_start_xmit = ei_start_xmit;
-		dev->get_stats	= ei_get_stats;
-		dev->set_multicast_list = ei_set_multicast_list;
-		dev->tx_timeout = ei_tx_timeout;
-	}
-#endif
+	if (dev)
+		dev->netdev_ops = &ei_netdev_ops;
 	return dev;
 }
 EXPORT_SYMBOL(__alloc_ei_netdev);
diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c
index da863c9..6ec11da 100644
--- a/drivers/net/8390p.c
+++ b/drivers/net/8390p.c
@@ -79,14 +79,8 @@ EXPORT_SYMBOL(eip_netdev_ops);
 struct net_device *__alloc_eip_netdev(int size)
 {
 	struct net_device *dev = ____alloc_ei_netdev(size);
-#ifdef CONFIG_COMPAT_NET_DEV_OPS
-	if (dev) {
-		dev->hard_start_xmit = eip_start_xmit;
-		dev->get_stats	= eip_get_stats;
-		dev->set_multicast_list = eip_set_multicast_list;
-		dev->tx_timeout = eip_tx_timeout;
-	}
-#endif
+	if (dev)
+		dev->netdev_ops = &eip_netdev_ops;
 	return dev;
 }
 EXPORT_SYMBOL(__alloc_eip_netdev);
-- 
1.6.2.3

Re: [PATCH -next 1/3] ipw2x00: remove old compat_net_dev_ops code

[David Miller]

From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Wed, 15 Apr 2009 21:58:27 +0400

> Since both ipw2100 and ipw2200 are already converted to new
> net_device_ops this code is useless.
> 
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>

Applied.

Re: [PATCH -next 2/3] usbnet: remove old compat_net_dev_ops code

[David Miller]

From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Wed, 15 Apr 2009 21:58:28 +0400

> Since all usb network drivers are already converted to net_device_ops
> this code is useless.
> 
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>

Applied.

Re: [PATCH -next 3/3] 8390(p): remove old compat_net_dev_ops code

[David Miller]

From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Wed, 15 Apr 2009 21:58:29 +0400

> Remove compat_net_dev_ops code and use struct net_device_ops
> instead of it.
> 
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>

Applied.