git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
net
/
hamradio
/
baycom_ser_fdx.c
diff --git
a/drivers/net/hamradio/baycom_ser_fdx.c
b/drivers/net/hamradio/baycom_ser_fdx.c
index
454dff0
..
25f270b
100644
(file)
--- a/
drivers/net/hamradio/baycom_ser_fdx.c
+++ b/
drivers/net/hamradio/baycom_ser_fdx.c
@@
-530,12
+530,11
@@
static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,
struct baycom_state *bc;
struct baycom_ioctl bi;
struct baycom_state *bc;
struct baycom_ioctl bi;
- if (!dev || !dev->priv ||
- ((struct baycom_state *)dev->priv)->hdrv.magic != HDLCDRV_MAGIC) {
- printk(KERN_ERR "bc_ioctl: invalid device struct\n");
+ if (!dev)
return -EINVAL;
return -EINVAL;
- }
+
bc = netdev_priv(dev);
bc = netdev_priv(dev);
+ BUG_ON(bc->hdrv.magic != HDLCDRV_MAGIC);
if (cmd != SIOCDEVPRIVATE)
return -ENOIOCTLCMD;
if (cmd != SIOCDEVPRIVATE)
return -ENOIOCTLCMD;