diff options
author | Jean Tourrilhes <jt@hpl.hp.com> | 2006-08-29 20:59:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-09-25 16:52:15 -0400 |
commit | 9fb08363f1f6d360dbaf6d7f51b9e7ca07c05ecd (patch) | |
tree | 75d15c62f8d1b07df7b563325b1feb32d9da3f0f /drivers/net/wireless | |
parent | 6a484db472e77218252025d31d4ef96dbc11ada9 (diff) |
[PATCH] WE-21 for hostap
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 7a4978516eac..d061fb3443ff 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
@@ -1412,9 +1412,9 @@ static int prism2_ioctl_siwretry(struct net_device *dev, | |||
1412 | /* what could be done, if firmware would support this.. */ | 1412 | /* what could be done, if firmware would support this.. */ |
1413 | 1413 | ||
1414 | if (rrq->flags & IW_RETRY_LIMIT) { | 1414 | if (rrq->flags & IW_RETRY_LIMIT) { |
1415 | if (rrq->flags & IW_RETRY_MAX) | 1415 | if (rrq->flags & IW_RETRY_LONG) |
1416 | HFA384X_RID_LONGRETRYLIMIT = rrq->value; | 1416 | HFA384X_RID_LONGRETRYLIMIT = rrq->value; |
1417 | else if (rrq->flags & IW_RETRY_MIN) | 1417 | else if (rrq->flags & IW_RETRY_SHORT) |
1418 | HFA384X_RID_SHORTRETRYLIMIT = rrq->value; | 1418 | HFA384X_RID_SHORTRETRYLIMIT = rrq->value; |
1419 | else { | 1419 | else { |
1420 | HFA384X_RID_LONGRETRYLIMIT = rrq->value; | 1420 | HFA384X_RID_LONGRETRYLIMIT = rrq->value; |
@@ -1468,14 +1468,14 @@ static int prism2_ioctl_giwretry(struct net_device *dev, | |||
1468 | rrq->value = le16_to_cpu(altretry); | 1468 | rrq->value = le16_to_cpu(altretry); |
1469 | else | 1469 | else |
1470 | rrq->value = local->manual_retry_count; | 1470 | rrq->value = local->manual_retry_count; |
1471 | } else if ((rrq->flags & IW_RETRY_MAX)) { | 1471 | } else if ((rrq->flags & IW_RETRY_LONG)) { |
1472 | rrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX; | 1472 | rrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG; |
1473 | rrq->value = longretry; | 1473 | rrq->value = longretry; |
1474 | } else { | 1474 | } else { |
1475 | rrq->flags = IW_RETRY_LIMIT; | 1475 | rrq->flags = IW_RETRY_LIMIT; |
1476 | rrq->value = shortretry; | 1476 | rrq->value = shortretry; |
1477 | if (shortretry != longretry) | 1477 | if (shortretry != longretry) |
1478 | rrq->flags |= IW_RETRY_MIN; | 1478 | rrq->flags |= IW_RETRY_SHORT; |
1479 | } | 1479 | } |
1480 | } | 1480 | } |
1481 | return 0; | 1481 | return 0; |