2014-10-09 18:36:42

by Fabian Frédérick

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

No need to store ieee80211_vif_use_reserved_context result and test it before returning.

Signed-off-by: Fabian Frederick <[email protected]>
---
net/mac80211/cfg.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

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,
--
1.9.3

2014-10-09 18:53:24

by Johannes Berg

Subject: Re: [PATCH 1/1 net-next] mac80211: directly return ieee80211_vif_use_reserved_context()

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