diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 04:01:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 04:01:23 -0400 |
| commit | ab1623da2b6659fa9e7810362430de482ebdb9cf (patch) | |
| tree | b1d8a3dd9ca48886173d19b681d167455e57cc56 /drivers/net/wireless/orinoco.c | |
| parent | 5b85f29ca453d56d83cdffa075d615583bb8fb72 (diff) | |
| parent | dc710afe95ee9b263ab593c11d86a684f1606872 (diff) | |
| download | kernel-crypto-ab1623da2b6659fa9e7810362430de482ebdb9cf.tar.gz kernel-crypto-ab1623da2b6659fa9e7810362430de482ebdb9cf.tar.xz kernel-crypto-ab1623da2b6659fa9e7810362430de482ebdb9cf.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/wireless/orinoco.c')
| -rw-r--r-- | drivers/net/wireless/orinoco.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index d6ed5781b93..317ace7f9aa 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -2875,7 +2875,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, if (orinoco_lock(priv, &flags) != 0) return -EBUSY; - if (erq->pointer) { + if (erq->length > 0) { if ((index < 0) || (index >= ORINOCO_MAX_KEYS)) index = priv->tx_key; @@ -2918,7 +2918,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, if (erq->flags & IW_ENCODE_RESTRICTED) restricted = 1; - if (erq->pointer) { + if (erq->pointer && erq->length > 0) { priv->keys[index].len = cpu_to_le16(xlen); memset(priv->keys[index].data, 0, sizeof(priv->keys[index].data)); |