Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff86a543 authored by Kai Engert's avatar Kai Engert Committed by Jeff Garzik
Browse files

[PATCH] prism54: add ethtool -i interface 



Add support for "ethtool -i" to prism54 driver.

ethtool -i queries the specified device for
associated driver information.

This helps tools like Fedora's system-config-network to
provide GUI management of network devices.
I learned how to write this patch by reading the ipw2100
driver code.

Signed-off-by: default avatarKai Engert <kengert@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 01917382

drivers/net/wireless/prism54/islpci_dev.c

+13 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/module.h>



#include <linux/netdevice.h>

#include <linux/ethtool.h>

#include <linux/pci.h>

#include <linux/etherdevice.h>

#include <linux/delay.h>
@@ -787,6 +788,17 @@ islpci_set_multicast_list(struct net_device *dev) 
}

#endif



static void islpci_ethtool_get_drvinfo(struct net_device *dev,

                                       struct ethtool_drvinfo *info)

{

	strcpy(info->driver, DRV_NAME);

	strcpy(info->version, DRV_VERSION);

}



static struct ethtool_ops islpci_ethtool_ops = {

	.get_drvinfo = islpci_ethtool_get_drvinfo,

};



struct net_device *

islpci_setup(struct pci_dev *pdev)

{
@@ -813,6 +825,7 @@ islpci_setup(struct pci_dev *pdev) 
	ndev->do_ioctl = &prism54_ioctl;

	ndev->wireless_handlers =

	    (struct iw_handler_def *) &prism54_handler_def;

	ndev->ethtool_ops = &islpci_ethtool_ops;



	ndev->hard_start_xmit = &islpci_eth_transmit;

	/* ndev->set_multicast_list = &islpci_set_multicast_list; */

drivers/net/wireless/prism54/islpci_dev.h

+4 −0
Original line number Diff line number Diff line
@@ -211,4 +211,8 @@ islpci_trigger(islpci_private *priv) 


int islpci_free_memory(islpci_private *);

struct net_device *islpci_setup(struct pci_dev *);



#define DRV_NAME	"prism54"

#define DRV_VERSION	"1.2"



#endif				/* _ISLPCI_DEV_H */

drivers/net/wireless/prism54/islpci_hotplug.c

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
#include "islpci_mgt.h"		/* for pc_debug */

#include "isl_oid.h"



#define DRV_NAME	"prism54"

#define DRV_VERSION	"1.2"



MODULE_AUTHOR("[Intersil] R.Bastings and W.Termorshuizen, The prism54.org Development Team <prism54-devel@prism54.org>");

MODULE_DESCRIPTION("The Prism54 802.11 Wireless LAN adapter");

MODULE_LICENSE("GPL");