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

Commit 2ae2d77c authored by Ben Dooks's avatar Ben Dooks Committed by Jeff Garzik
Browse files

[PATCH] DM9000 - incorrect ioctl() handling 



The DM9000 driver is responding to ioctl() calls it should not be. This
can cause problems with the wireless tools incorrectly indentifying the
device as wireless capable, and crashing under certain operations.

This patch also moves the version printk() to the init call, so that
you only get it once for multiple devices, and to show it is loaded
if there are no defined dm9000s

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 9ef9ac51

drivers/net/dm9000.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -152,7 +152,6 @@ static int dm9000_probe(struct device *); 
static int dm9000_open(struct net_device *);

static int dm9000_open(struct net_device *);

static int dm9000_start_xmit(struct sk_buff *, struct net_device *);

static int dm9000_start_xmit(struct sk_buff *, struct net_device *);

static int dm9000_stop(struct net_device *);

static int dm9000_stop(struct net_device *);

static int dm9000_do_ioctl(struct net_device *, struct ifreq *, int);









static void dm9000_timer(unsigned long);

static void dm9000_timer(unsigned long);
@@ -391,8 +390,6 @@ dm9000_probe(struct device *dev) 
	int i;

	int i;

	u32 id_val;

	u32 id_val;





	printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);



	/* Init network device */

	/* Init network device */

	ndev = alloc_etherdev(sizeof (struct board_info));

	ndev = alloc_etherdev(sizeof (struct board_info));

	if (!ndev) {

	if (!ndev) {
@@ -547,7 +544,6 @@ dm9000_probe(struct device *dev) 
	ndev->stop		 = &dm9000_stop;

	ndev->stop		 = &dm9000_stop;

	ndev->get_stats		 = &dm9000_get_stats;

	ndev->get_stats		 = &dm9000_get_stats;

	ndev->set_multicast_list = &dm9000_hash_table;

	ndev->set_multicast_list = &dm9000_hash_table;

	ndev->do_ioctl		 = &dm9000_do_ioctl;





#ifdef DM9000_PROGRAM_EEPROM

#ifdef DM9000_PROGRAM_EEPROM

	program_eeprom(db);

	program_eeprom(db);
@@ -851,15 +847,6 @@ dm9000_get_stats(struct net_device *dev) 
	return &db->stats;

	return &db->stats;

}

}





/*

 *  Process the upper socket ioctl command

 */

static int

dm9000_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	PRINTK1("entering %s\n",__FUNCTION__);

	return 0;

}





/*

/*

 *  A periodic timer routine

 *  A periodic timer routine
@@ -1213,6 +1200,8 @@ static struct device_driver dm9000_driver = { 
static int __init

static int __init

dm9000_init(void)

dm9000_init(void)

{

{

	printk(KERN_INFO "%s Ethernet Driver\n", CARDNAME);



	return driver_register(&dm9000_driver);	/* search board and register */

	return driver_register(&dm9000_driver);	/* search board and register */

}

}