diff mbox

[1/1,net-next] mac80211: directly return ieee80211_vif_use_reserved_context()

Message ID 1412879782-8818-1-git-send-email-fabf@skynet.be
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Fabian Frederick Oct. 9, 2014, 6:36 p.m. UTC
No need to store ieee80211_vif_use_reserved_context result and test it before returning.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 net/mac80211/cfg.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Johannes Berg Oct. 9, 2014, 6:53 p.m. UTC | #1
On Thu, 2014-10-09 at 20:36 +0200, Fabian Frederick wrote:
> No need to store ieee80211_vif_use_reserved_context result and test it before returning.

Makes sense, applied. Please break commit log lines to <=72 characters
in the future though.

johannes

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index fb6a150..c76b457 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2850,11 +2850,7 @@  static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata)
 		if (sdata->reserved_ready)
 			return 0;
 
-		err = ieee80211_vif_use_reserved_context(sdata);
-		if (err)
-			return err;
-
-		return 0;
+		return ieee80211_vif_use_reserved_context(sdata);
 	}
 
 	if (!cfg80211_chandef_identical(&sdata->vif.bss_conf.chandef,