|
@@ -1412,9 +1412,9 @@ static int prism2_ioctl_siwretry(struct net_device *dev,
|
|
/* what could be done, if firmware would support this.. */
|
|
/* what could be done, if firmware would support this.. */
|
|
|
|
|
|
if (rrq->flags & IW_RETRY_LIMIT) {
|
|
if (rrq->flags & IW_RETRY_LIMIT) {
|
|
- if (rrq->flags & IW_RETRY_MAX)
|
|
|
|
|
|
+ if (rrq->flags & IW_RETRY_LONG)
|
|
HFA384X_RID_LONGRETRYLIMIT = rrq->value;
|
|
HFA384X_RID_LONGRETRYLIMIT = rrq->value;
|
|
- else if (rrq->flags & IW_RETRY_MIN)
|
|
|
|
|
|
+ else if (rrq->flags & IW_RETRY_SHORT)
|
|
HFA384X_RID_SHORTRETRYLIMIT = rrq->value;
|
|
HFA384X_RID_SHORTRETRYLIMIT = rrq->value;
|
|
else {
|
|
else {
|
|
HFA384X_RID_LONGRETRYLIMIT = rrq->value;
|
|
HFA384X_RID_LONGRETRYLIMIT = rrq->value;
|
|
@@ -1468,14 +1468,14 @@ static int prism2_ioctl_giwretry(struct net_device *dev,
|
|
rrq->value = le16_to_cpu(altretry);
|
|
rrq->value = le16_to_cpu(altretry);
|
|
else
|
|
else
|
|
rrq->value = local->manual_retry_count;
|
|
rrq->value = local->manual_retry_count;
|
|
- } else if ((rrq->flags & IW_RETRY_MAX)) {
|
|
|
|
- rrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
|
|
|
|
|
|
+ } else if ((rrq->flags & IW_RETRY_LONG)) {
|
|
|
|
+ rrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG;
|
|
rrq->value = longretry;
|
|
rrq->value = longretry;
|
|
} else {
|
|
} else {
|
|
rrq->flags = IW_RETRY_LIMIT;
|
|
rrq->flags = IW_RETRY_LIMIT;
|
|
rrq->value = shortretry;
|
|
rrq->value = shortretry;
|
|
if (shortretry != longretry)
|
|
if (shortretry != longretry)
|
|
- rrq->flags |= IW_RETRY_MIN;
|
|
|
|
|
|
+ rrq->flags |= IW_RETRY_SHORT;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|