Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fe86440 authored Jun 09, 2012 by Dan Carpenter Committed by Greg Kroah-Hartman Jun 12, 2012

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>

parent 0cf5755f

drivers/staging/rtl8187se/r8180_wx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/staging/rtl8192e/rtl8192e/rtl_wx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;