From patchwork Sat Mar 8 03:01:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 3797051 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5B1DB9F369 for ; Sat, 8 Mar 2014 03:03:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5870520304 for ; Sat, 8 Mar 2014 03:02:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 895BE202E9 for ; Sat, 8 Mar 2014 03:02:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752153AbaCHDCi (ORCPT ); Fri, 7 Mar 2014 22:02:38 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:57009 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751713AbaCHDCh (ORCPT ); Fri, 7 Mar 2014 22:02:37 -0500 Received: by mail-pd0-f177.google.com with SMTP id g10so4806376pdj.36 for ; Fri, 07 Mar 2014 19:02:37 -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=t7qXfRpifczR/+W/dbkyN4ZJWAooHB+o62+ENev80Oo=; b=GOAae1flGP7nxppiNyaZZb4QbeyxYhIMnWOaA7GhahwLipuBl3BimWIh8ZNlMlXJjZ VC2SLXtQ5eBRwvLq1ja1P4ANZ77OOmgDlNE6iVB6Vgpe+uRcWSQ4icRnRL34s+ud27FV xH6SCUia2BXWXVTO2a8LtlEfMHLBDeG8B6bKcRyGX5nkc5X/iq2pfUMgdwiOYrSFkBgP hwjko97pxIc+LrqlEq25w70vIj/meYAZgvDEg13aDe2jBIANT7/ziUbFadlZXgj9NXrX 0rmURm/I672okPkP1HDtnruO+yDlQpkU2+0v8VkpCSF8QN+bhp6n7ctMvojQUAoDc70H v6zQ== X-Received: by 10.68.136.2 with SMTP id pw2mr25751906pbb.167.1394247756902; Fri, 07 Mar 2014 19:02:36 -0800 (PST) Received: from will.lan ([61.157.126.2]) by mx.google.com with ESMTPSA id tu3sm18879838pab.1.2014.03.07.19.02.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Mar 2014 19:02:26 -0800 (PST) From: "Zhao, Gang" To: Cc: Johannes Berg Subject: [PATCH] cfg80211: make __cfg80211_join_ibss() static Date: Sat, 8 Mar 2014 11:01:24 +0800 Message-Id: <0962cca52541e7067f7c001046fd6d36e7a76640.1394247591.git.gamerh2o@gmail.com> X-Mailer: git-send-email 1.8.5.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Function __cfg80211_join_ibss() is only used in net/wireless/ibss.c, so make it static. Signed-off-by: Zhao, Gang --- net/wireless/core.h | 4 ---- net/wireless/ibss.c | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/net/wireless/core.h b/net/wireless/core.h index 4068300..766aabc 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -246,10 +246,6 @@ void cfg80211_bss_age(struct cfg80211_registered_device *dev, unsigned long age_secs); /* IBSS */ -int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, - struct net_device *dev, - struct cfg80211_ibss_params *params, - struct cfg80211_cached_keys *connkeys); int cfg80211_join_ibss(struct cfg80211_registered_device *rdev, struct net_device *dev, struct cfg80211_ibss_params *params, diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 349db9d..a6b5bda 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -82,10 +82,10 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, } EXPORT_SYMBOL(cfg80211_ibss_joined); -int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, - struct net_device *dev, - struct cfg80211_ibss_params *params, - struct cfg80211_cached_keys *connkeys) +static int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, + struct net_device *dev, + struct cfg80211_ibss_params *params, + struct cfg80211_cached_keys *connkeys) { struct wireless_dev *wdev = dev->ieee80211_ptr; struct ieee80211_channel *check_chan;