From patchwork Thu Jan 14 11:09:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 72821 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0EBA98M017161 for ; Thu, 14 Jan 2010 11:10:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756415Ab0ANLJx (ORCPT ); Thu, 14 Jan 2010 06:09:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756400Ab0ANLJx (ORCPT ); Thu, 14 Jan 2010 06:09:53 -0500 Received: from smtp.nokia.com ([192.100.122.230]:51038 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756215Ab0ANLJv (ORCPT ); Thu, 14 Jan 2010 06:09:51 -0500 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o0EB9Gga010906 for ; Thu, 14 Jan 2010 13:09:48 +0200 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 14 Jan 2010 13:09:20 +0200 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 14 Jan 2010 13:09:20 +0200 Received: from [127.0.1.1] (trdhcp21270.nmp.nokia.com [172.22.212.70]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o0EB9HvF027598 for ; Thu, 14 Jan 2010 13:09:18 +0200 Subject: [PATCH 1/2] mac80211: fix mac80211.h documentation warnings To: linux-wireless@vger.kernel.org From: Kalle Valo Date: Thu, 14 Jan 2010 13:09:14 +0200 Message-ID: <20100114110914.22608.12379.stgit@tikku> In-Reply-To: <20100114110826.22608.23087.stgit@tikku> References: <20100114110826.22608.23087.stgit@tikku> User-Agent: StGit/0.15 MIME-Version: 1.0 X-OriginalArrivalTime: 14 Jan 2010 11:09:20.0602 (UTC) FILETIME=[05624BA0:01CA950A] X-Nokia-AV: Clean Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/Documentation/DocBook/mac80211.tmpl b/Documentation/DocBook/mac80211.tmpl index f3f37f1..971d1c0 100644 --- a/Documentation/DocBook/mac80211.tmpl +++ b/Documentation/DocBook/mac80211.tmpl @@ -144,7 +144,7 @@ usage should require reading the full document. this though and the recommendation to allow only a single interface in STA mode at first! -!Finclude/net/mac80211.h ieee80211_if_init_conf +!Finclude/net/mac80211.h ieee80211_vif diff --git a/include/net/mac80211.h b/include/net/mac80211.h index f313a3c..bbfa475 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -107,6 +107,7 @@ enum ieee80211_max_queues { * 2^n-1 in the range 1..32767] * @cw_max: maximum contention window [like @cw_min] * @txop: maximum burst time in units of 32 usecs, 0 meaning disabled + * @uapsd: is U-APSD mode enabled for the queue */ struct ieee80211_tx_queue_params { u16 txop; @@ -608,7 +609,11 @@ enum ieee80211_conf_changed { /** * enum ieee80211_smps_mode - spatial multiplexing power save mode * - * @ + * @IEEE80211_SMPS_AUTOMATIC: automatic + * @IEEE80211_SMPS_OFF: off + * @IEEE80211_SMPS_STATIC: static + * @IEEE80211_SMPS_DYNAMIC: dynamic + * @IEEE80211_SMPS_NUM_MODES: internal, don't use */ enum ieee80211_smps_mode { IEEE80211_SMPS_AUTOMATIC,