| Message ID | 1521094832-6311-1-git-send-email-gbhat@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6c20495b7debf1f937027526306df3d5daeeb7bc |
| Delegated to: | Kalle Valo |
| Headers | show |
Ganapathi Bhat <gbhat@marvell.com> writes: > Fix the following sparse warning in mwifiex_cmd_append_11n_tlv: > drivers/net/wireless/marvell/mwifiex/11n.c:358:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:358:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:358:65: right side has type int > drivers/net/wireless/marvell/mwifiex/11n.c:360:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:360:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:360:65: right side has type int > drivers/net/wireless/marvell/mwifiex/11n.c:366:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:366:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:366:65: right side has type int > drivers/net/wireless/marvell/mwifiex/11n.c:368:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:368:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:368:65: right side has type int > > This is a follow up to commit 77423fa73927 > ("mwifiex: fix incorrect ht capability problem") I'll replace this sentence with: Fixes: 77423fa73927 ("mwifiex: fix incorrect ht capability problem")
Ganapathi Bhat <gbhat@marvell.com> wrote: > Fix the following sparse warning in mwifiex_cmd_append_11n_tlv: > > drivers/net/wireless/marvell/mwifiex/11n.c:358:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:358:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:358:65: right side has type int > drivers/net/wireless/marvell/mwifiex/11n.c:360:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:360:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:360:65: right side has type int > drivers/net/wireless/marvell/mwifiex/11n.c:366:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:366:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:366:65: right side has type int > drivers/net/wireless/marvell/mwifiex/11n.c:368:65: warning: invalid assignment: &= > drivers/net/wireless/marvell/mwifiex/11n.c:368:65: left side has type restricted __le16 > drivers/net/wireless/marvell/mwifiex/11n.c:368:65: right side has type int > > Fixes: 77423fa73927 ("mwifiex: fix incorrect ht capability problem") > Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> Patch applied to wireless-drivers-next.git, thanks. 6c20495b7deb mwifiex: remove warnings in mwifiex_cmd_append_11n_tlv()
diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c index feebfdc..5d75c97 100644 --- a/drivers/net/wireless/marvell/mwifiex/11n.c +++ b/drivers/net/wireless/marvell/mwifiex/11n.c @@ -356,17 +356,19 @@ int mwifiex_cmd_11n_cfg(struct mwifiex_private *priv, case IEEE80211_HT_PARAM_CHA_SEC_ABOVE: if (chan->flags & IEEE80211_CHAN_NO_HT40PLUS) { ht_cap->ht_cap.cap_info &= - ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; + cpu_to_le16 + (~IEEE80211_HT_CAP_SUP_WIDTH_20_40); ht_cap->ht_cap.cap_info &= - ~IEEE80211_HT_CAP_SGI_40; + cpu_to_le16(~IEEE80211_HT_CAP_SGI_40); } break; case IEEE80211_HT_PARAM_CHA_SEC_BELOW: if (chan->flags & IEEE80211_CHAN_NO_HT40MINUS) { ht_cap->ht_cap.cap_info &= - ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; + cpu_to_le16 + (~IEEE80211_HT_CAP_SUP_WIDTH_20_40); ht_cap->ht_cap.cap_info &= - ~IEEE80211_HT_CAP_SGI_40; + cpu_to_le16(~IEEE80211_HT_CAP_SGI_40); } break; }
Fix the following sparse warning in mwifiex_cmd_append_11n_tlv: drivers/net/wireless/marvell/mwifiex/11n.c:358:65: warning: invalid assignment: &= drivers/net/wireless/marvell/mwifiex/11n.c:358:65: left side has type restricted __le16 drivers/net/wireless/marvell/mwifiex/11n.c:358:65: right side has type int drivers/net/wireless/marvell/mwifiex/11n.c:360:65: warning: invalid assignment: &= drivers/net/wireless/marvell/mwifiex/11n.c:360:65: left side has type restricted __le16 drivers/net/wireless/marvell/mwifiex/11n.c:360:65: right side has type int drivers/net/wireless/marvell/mwifiex/11n.c:366:65: warning: invalid assignment: &= drivers/net/wireless/marvell/mwifiex/11n.c:366:65: left side has type restricted __le16 drivers/net/wireless/marvell/mwifiex/11n.c:366:65: right side has type int drivers/net/wireless/marvell/mwifiex/11n.c:368:65: warning: invalid assignment: &= drivers/net/wireless/marvell/mwifiex/11n.c:368:65: left side has type restricted __le16 drivers/net/wireless/marvell/mwifiex/11n.c:368:65: right side has type int This is a follow up to commit 77423fa73927 ("mwifiex: fix incorrect ht capability problem") Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> --- drivers/net/wireless/marvell/mwifiex/11n.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)