diff options
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 16 | ||||
| -rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 11 | 
2 files changed, 0 insertions, 27 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 88560d0ae50..3bd9cf76517 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -43,7 +43,6 @@  #include <linux/if_arp.h>  #include <linux/ioport.h>  #include <linux/skbuff.h> -#include <linux/ethtool.h>  #include <linux/ieee80211.h>  #include <pcmcia/cs.h> @@ -80,8 +79,6 @@ static int ray_dev_config(struct net_device *dev, struct ifmap *map);  static struct net_device_stats *ray_get_stats(struct net_device *dev);  static int ray_dev_init(struct net_device *dev); -static const struct ethtool_ops netdev_ethtool_ops; -  static int ray_open(struct net_device *dev);  static netdev_tx_t ray_dev_start_xmit(struct sk_buff *skb,  					    struct net_device *dev); @@ -333,7 +330,6 @@ static int ray_probe(struct pcmcia_device *p_dev)  	/* Raylink entries in the device structure */  	dev->netdev_ops = &ray_netdev_ops; -	SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);  	dev->wireless_handlers = &ray_handler_def;  #ifdef WIRELESS_SPY  	local->wireless_data.spy_data = &local->spy_data; @@ -1062,18 +1058,6 @@ AP to AP	1	1	dest AP		src AP		dest	source  	}  } /* end encapsulate_frame */ -/*===========================================================================*/ - -static void netdev_get_drvinfo(struct net_device *dev, -			       struct ethtool_drvinfo *info) -{ -	strcpy(info->driver, "ray_cs"); -} - -static const struct ethtool_ops netdev_ethtool_ops = { -	.get_drvinfo = netdev_get_drvinfo, -}; -  /*====================================================================*/  /*------------------------------------------------------------------*/ diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index a1cc2d498a1..420e9e986a1 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c @@ -29,7 +29,6 @@  #include <linux/delay.h>  #include <linux/types.h> -#include <linux/ethtool.h>  #include <linux/init.h>  #include <linux/interrupt.h>  #include <linux/in.h> @@ -1411,15 +1410,6 @@ static struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)  	return wstats;  } -static void wl3501_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) -{ -	strlcpy(info->driver, "wl3501_cs", sizeof(info->driver)); -} - -static const struct ethtool_ops ops = { -	.get_drvinfo = wl3501_get_drvinfo -}; -  /**   * wl3501_detach - deletes a driver "instance"   * @link - FILL_IN @@ -1905,7 +1895,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev)  	this->p_dev = p_dev;  	dev->wireless_data	= &this->wireless_data;  	dev->wireless_handlers	= &wl3501_handler_def; -	SET_ETHTOOL_OPS(dev, &ops);  	netif_stop_queue(dev);  	p_dev->priv = dev;  |