diff mbox series

wlcore: remove stray plus sign

Message ID 20200312090405.5b1ee546a14b.I0a6a1a4c07a68ed1a435edb9553694bdb844e3a8@changeid (mailing list archive)
State Accepted
Commit e2e57291097b289f84e05fa58ab5e6c6f30cc6e2
Delegated to: Kalle Valo
Headers show
Series wlcore: remove stray plus sign | expand

Commit Message

Johannes Berg March 12, 2020, 8:04 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

The commit mentioned below added a stray plus sign, likely
due to some conflict resolution (i.e. as a leftover from a
unified diff), which was harmless since it was just used as
an integer constant modifier. Remove it anyway, now that I
stumbled across it.

Fixes: cf33a7728bf2 ("wlcore: mesh: Add support for RX Broadcast Key")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/ti/wlcore/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo March 12, 2020, 2:01 p.m. UTC | #1 
Johannes Berg <johannes@sipsolutions.net> writes:

> From: Johannes Berg <johannes.berg@intel.com>
>
> The commit mentioned below added a stray plus sign, likely
> due to some conflict resolution (i.e. as a leftover from a
> unified diff), which was harmless since it was just used as
> an integer constant modifier. Remove it anyway, now that I
> stumbled across it.
>
> Fixes: cf33a7728bf2 ("wlcore: mesh: Add support for RX Broadcast Key")
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

I'll queue this to v5.6.
Kalle Valo March 12, 2020, 4:48 p.m. UTC | #2 
Johannes Berg <johannes@sipsolutions.net> wrote:

> From: Johannes Berg <johannes.berg@intel.com>
> 
> The commit mentioned below added a stray plus sign, likely
> due to some conflict resolution (i.e. as a leftover from a
> unified diff), which was harmless since it was just used as
> an integer constant modifier. Remove it anyway, now that I
> stumbled across it.
> 
> Fixes: cf33a7728bf2 ("wlcore: mesh: Add support for RX Broadcast Key")
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Patch applied to wireless-drivers.git, thanks.

e2e57291097b wlcore: remove stray plus sign
diff mbox series

Patch

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index ed049c9f7e29..f140f7d7f553 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -6274,7 +6274,7 @@  static int wl1271_init_ieee80211(struct wl1271 *wl)
 	wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD |
 				WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
 				WIPHY_FLAG_HAS_CHANNEL_SWITCH |
-+				WIPHY_FLAG_IBSS_RSN;
+				WIPHY_FLAG_IBSS_RSN;
 
 	wl->hw->wiphy->features |= NL80211_FEATURE_AP_SCAN;