mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
Staging: rtl8187se, rtl8192e: fix '&' vs '|' bugs
The original code is equivalent to: wrqu->retry.flags = 0x1000 & 0x0002; so it just sets .flags to zero. We should be ORing the values together like r8192_wx_get_retry() does in drivers/staging/rtl8192u/r8192U_wx.c. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0cf5755f00
commit
6fe864409b
2 changed files with 4 additions and 4 deletions
|
@ -615,10 +615,10 @@ static int r8180_wx_get_retry(struct net_device *dev,
|
|||
return -EINVAL;
|
||||
|
||||
if (wrqu->retry.flags & IW_RETRY_MAX) {
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MAX;
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
|
||||
wrqu->retry.value = priv->retry_rts;
|
||||
} else {
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MIN;
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_MIN;
|
||||
wrqu->retry.value = priv->retry_data;
|
||||
}
|
||||
|
||||
|
|
|
@ -919,10 +919,10 @@ static int r8192_wx_get_retry(struct net_device *dev,
|
|||
return -EINVAL;
|
||||
|
||||
if (wrqu->retry.flags & IW_RETRY_MAX) {
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MAX;
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
|
||||
wrqu->retry.value = priv->retry_rts;
|
||||
} else {
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MIN;
|
||||
wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_MIN;
|
||||
wrqu->retry.value = priv->retry_data;
|
||||
}
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue