From patchwork Thu Oct 9 18:36:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 398103 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3BB551400D5 for ; Fri, 10 Oct 2014 05:36:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751664AbaJISgg (ORCPT ); Thu, 9 Oct 2014 14:36:36 -0400 Received: from mailrelay005.isp.belgacom.be ([195.238.6.171]:43623 "EHLO mailrelay005.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751240AbaJISge (ORCPT ); Thu, 9 Oct 2014 14:36:34 -0400 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AkkOACnVNlRbtAbo/2dsb2JhbABfgw6BK7dZCAEBAQUBc5oKgQoXAXuEMS8jgRo3iEIBtGqOUYYgiiQdhDUFnUuMXIk1giCBRTsvgkoBAQE Received: from 232.6-180-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.180.6.232]) by relay.skynet.be with ESMTP; 09 Oct 2014 20:36:29 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , "John W. Linville" , Johannes Berg , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 1/1 net-next] mac80211: directly return ieee80211_vif_use_reserved_context() Date: Thu, 9 Oct 2014 20:36:22 +0200 Message-Id: <1412879782-8818-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No need to store ieee80211_vif_use_reserved_context result and test it before returning. Signed-off-by: Fabian Frederick --- 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,