From patchwork Thu Jan 21 05:36:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Shahu X-Patchwork-Id: 571045 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 9864D140081 for ; Thu, 21 Jan 2016 16:37:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hOSBRYCX; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935328AbcAUFgs (ORCPT ); Thu, 21 Jan 2016 00:36:48 -0500 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33252 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932745AbcAUFgl (ORCPT ); Thu, 21 Jan 2016 00:36:41 -0500 Received: by mail-pf0-f170.google.com with SMTP id e65so17422719pfe.0; Wed, 20 Jan 2016 21:36:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=uBAJ+8C2/W1l7MiD5h3mAVjqPUAROPsfff0iFTq4/qM=; b=hOSBRYCXlfMhM5zVkmsTa0r4u0YbkQ81QzsxzjFK2EWXLI4cnB0HXMD7QIkiIbEbdA Gs+HG/iCNeUKMRy5jgCLJWKR48cSd+O1okSF+N3RUcN4F3ZNVgStCF7gvg2VqNQ1k6Xy CsESfQVavWKybRU1c62BA9dVhJV1HsDZVJ1jGu1JcNb2wodjrIQ8+ya+mQeZGsfywpsk XyKu0eojrGRXv9p+ag1uSmfkaXYceU7A6xkCIaNAJDwLqlu99SxEINl6IsAh/vMRaO2Q FEfRCx7Pxb0jF+2+mhQGXsYAlF2zHiURfhlcDgC1xAPtd1s7WBkBuHM+6i9V7+I7d/FG JK4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uBAJ+8C2/W1l7MiD5h3mAVjqPUAROPsfff0iFTq4/qM=; b=btnYpfbdHHV1P4Be+Ibo+7eppA9TlDnFYq0VE18AlIBOM33pDucCxRvD/8sW1936sT fo7REpu+4yymq+e6BJjlwIkUeQg4d2q7vmyzBegKi8CkxUXuZXQGC5Td79PYWP18vMsg K7xLnEwlmnX9VLnJ15mAOmqsLKUWaNdkviy3tnvD9Kovj3NhPcC3pIFO0dyEjOQTdBhK YzXnQgNwbM5GZToNCJonmj/k1yoS/o5OX8aK1/JEvQCm0mWPL7NScFHnFyNecnCXTDmn QVFGXYwXFoPRXA8NzeBk48Q+XIHTp6LMlrxa+Fs5ibwXayK6cKFjAs3GZD/GqLsVgkAq 03Tg== X-Gm-Message-State: AG10YORKpiRfXr4AQ6h1dG1q+c7pZXyhHMpMTFlYBnM9xz9D5+AWP2EF/Z1e0TsPcf/Qrw== X-Received: by 10.98.15.82 with SMTP id x79mr25695623pfi.52.1453354600351; Wed, 20 Jan 2016 21:36:40 -0800 (PST) Received: from sunil.sibshivalik.com ([202.131.115.146]) by smtp.gmail.com with ESMTPSA id m70sm52404779pfi.90.2016.01.20.21.36.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 21:36:39 -0800 (PST) From: Sunil Shahu To: johannes@sipsolutions.net Cc: davem@davemloft.net, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net:mac80211:mesh_plink: remove redundant sta_info check Date: Thu, 21 Jan 2016 11:06:25 +0530 Message-Id: <1453354585-26069-1-git-send-email-shshahu@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove unnecessory "if" statement and club it with previos "if" block. Signed-off-by: Sunil Shahu --- net/mac80211/mesh_plink.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index bd3d55e..e5851ae 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -976,6 +976,9 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata, mpl_dbg(sdata, "Mesh plink error: no more free plinks\n"); goto out; } + /* new matching peer */ + event = OPN_ACPT; + goto out; } else { if (!test_sta_flag(sta, WLAN_STA_AUTH)) { mpl_dbg(sdata, "Mesh plink: Action frame from non-authed peer\n"); @@ -985,12 +988,6 @@ mesh_plink_get_event(struct ieee80211_sub_if_data *sdata, goto out; } - /* new matching peer */ - if (!sta) { - event = OPN_ACPT; - goto out; - } - switch (ftype) { case WLAN_SP_MESH_PEERING_OPEN: if (!matches_local)