From patchwork Fri Feb 8 22:54:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 2118821 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 89B2DDFE75 for ; Fri, 8 Feb 2013 22:55:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947156Ab3BHWzo (ORCPT ); Fri, 8 Feb 2013 17:55:44 -0500 Received: from mail-da0-f47.google.com ([209.85.210.47]:50520 "EHLO mail-da0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757385Ab3BHWzn (ORCPT ); Fri, 8 Feb 2013 17:55:43 -0500 Received: by mail-da0-f47.google.com with SMTP id s35so2017958dak.34 for ; Fri, 08 Feb 2013 14:55:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=nS9bmZBtHmNKPEuzROds/E2E0gCVZli5Kn6yE+hBsXA=; b=HCr0ui0Lf5PQmRkYGN/yzLjEUt1YJLScr09hpSU0qe33I7Ck4iMy4pLeMGw5Uj0j4B SPFtzGYHw416pWfAbwijB0dWabKLgNz+faxllz0Hik/xjE3FfjN0dMxUxQogkY/7DGG0 hGf4pqNCP1evC5WutmF5ksQMvpDn33Ljv0R33KwW7yW01YR+Aijtggf3WK8MIWdj1Ujq pVdMBWjvOh/4DcR62tHZa3J0PRj792DZFhlL1EcJdbT0QRV/e30GlqHFWvCtaBuq6EGJ 2cmIzE1My/8bPu4b7/RnVLmXid6N6H5+U7BSfSbPTsUifLVm/XmilJtH8FmbgF2g2tZb IiEA== X-Received: by 10.66.52.1 with SMTP id p1mr8066794pao.22.1360364143131; Fri, 08 Feb 2013 14:55:43 -0800 (PST) Received: from cable.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPS id o5sm57778970pay.5.2013.02.08.14.55.40 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 08 Feb 2013 14:55:41 -0800 (PST) From: Thomas Pedersen To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Thomas Pedersen Subject: [PATCH] mac80211: fix CONFIG_MAC80211=n build breakage Date: Fri, 8 Feb 2013 14:54:37 -0800 Message-Id: <1360364077-12204-1-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnqXeM4DKby19TRLIbixucGPLAvus/oEO1Vw86PGulScFgWfBtRZVBSsWo9mSXaQCaCdeSA Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The original mesh_sta_cleanup() declaration should have been inside the ifdef. Signed-off-by: Thomas Pedersen --- net/mac80211/mesh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index e5f6095..cd7868a 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -294,7 +294,6 @@ void mesh_plink_block(struct sta_info *sta); void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_mgmt *mgmt, size_t len, struct ieee80211_rx_status *rx_status); -void mesh_sta_cleanup(struct sta_info *sta); /* Private interfaces */ /* Mesh tables */ @@ -367,6 +366,7 @@ void mesh_plink_quiesce(struct sta_info *sta); void mesh_plink_restart(struct sta_info *sta); void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata); void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata); +void mesh_sta_cleanup(struct sta_info *sta); #else #define mesh_allocated 0 static inline void