[PATCH][2.4/2.5] Fix ns83820 ioctl oops

Roger Luethi (rl@hellgate.ch)
Tue, 26 Nov 2002 13:27:30 +0100


--lrZ03NoBR/3+SXJZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Patch fixes the line mistaking a null pointer for an actual reference.
Also, to prevent this from happening again, the null pointer now is
replaced with the real one. Please apply.

Roger

--lrZ03NoBR/3+SXJZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ns83820.c.diff"

--- drivers/net/ns83820.c.orig Wed Nov 20 12:51:37 2002
+++ drivers/net/ns83820.c Tue Nov 26 12:51:39 2002
@@ -1214,7 +1214,7 @@ static int ns83820_ethtool_ioctl (struct

static int ns83820_ioctl(struct net_device *_dev, struct ifreq *rq, int cmd)
{
- struct ns83820 *dev = _dev->priv;
+ struct ns83820 *dev = (struct ns83820 *)_dev;

switch(cmd) {
case SIOCETHTOOL:
@@ -1788,6 +1788,7 @@ static int __devinit ns83820_init_one(st
dev->ee.cache = &dev->MEAR_cache;
dev->ee.lock = &dev->misc_lock;
dev->net_dev.owner = THIS_MODULE;
+ dev->net_dev.priv = dev;

PREPARE_TQUEUE(&dev->tq_refill, queue_refill, dev);
tasklet_init(&dev->rx_tasklet, rx_action, (unsigned long)dev);

--lrZ03NoBR/3+SXJZ--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/