[PATCH] wlcore: remove stray plus sign

[PATCH] wlcore: remove stray plus sign

[Johannes Berg]

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(-)

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;
 
-- 
2.24.1

Re: [PATCH] wlcore: remove stray plus sign

[Kalle Valo]

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.

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH] wlcore: remove stray plus sign

[Kalle Valo]

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

-- 
https://patchwork.kernel.org/patch/11433415/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches