From: Rashika Kheria Date: Thu, 7 Nov 2013 13:27:37 +0000 (+0530) Subject: Staging: rtl8192e: Fix Sparse Warning of invalid assignment '|=' in rtllib_softmac.c X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7fe30a7d4af6a0cce07b6ca9dd2a624eead661d2;p=openwrt%2Fstaging%2Fblogic.git Staging: rtl8192e: Fix Sparse Warning of invalid assignment '|=' in rtllib_softmac.c This patch fixes the following Sparse warning in rtllib_softmac.c- drivers/staging/rtl8192e/rtllib_softmac.c:812:40: warning: invalid assignment: |= drivers/staging/rtl8192e/rtllib_softmac.c:812:40: left side has type restricted __le16 drivers/staging/rtl8192e/rtllib_softmac.c:812:40: right side has type int drivers/staging/rtl8192e/rtllib_softmac.c:924:17: warning: invalid assignment: |= drivers/staging/rtl8192e/rtllib_softmac.c:924:17: left side has type restricted __le16 drivers/staging/rtl8192e/rtllib_softmac.c:924:17: right side has type int drivers/staging/rtl8192e/rtllib_softmac.c:924:17: error: cast from unknown type Signed-off-by: Rashika Kheria Reviewed-by: Peter P Waskiewicz Jr Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 0ad159f52d4c..721ee254b820 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -809,7 +809,7 @@ inline struct sk_buff *rtllib_authentication_req(struct rtllib_network *beacon, auth->header.frame_ctl = RTLLIB_STYPE_AUTH; if (challengelen) - auth->header.frame_ctl |= RTLLIB_FCTL_WEP; + auth->header.frame_ctl |= cpu_to_le16(RTLLIB_FCTL_WEP); auth->header.duration_id = 0x013a; memcpy(auth->header.addr1, beacon->bssid, ETH_ALEN); @@ -921,8 +921,8 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest) if (ieee->short_slot && (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)) - cpu_to_le16((beacon_buf->capability |= - WLAN_CAPABILITY_SHORT_SLOT_TIME)); + beacon_buf->capability |= + cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; if (encrypt)