From patchwork Mon Jun 3 12:08:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 10972811 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1D13912 for ; Mon, 3 Jun 2019 12:09:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEE6E285C3 for ; Mon, 3 Jun 2019 12:09:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B34CF28732; Mon, 3 Jun 2019 12:09:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64160286D6 for ; Mon, 3 Jun 2019 12:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8FHNxn9TiB7dxKzais76LvCb9wY/009KBANUBFcFT28=; b=mSCqEj2oJ9TRmO eWLzabDeNkssk0Ropmt+hh6w02Sy+bsg3E2PXr78wu9W6WExObqHja6uHY1LjBCTo0nhMy75otdAi ggUtI1UIkFD8Rgg7naDJ2xOc20SscIhmUiLLPUt28NQ35l27DFMR0Lmhcv+sbLYjUgArpBMF6/gy3 rEjSyGUT+F3dx9668CZxwnhq2p9ZsQMQ7R0bbDbAkJZ7WM8QXDi29HrM9qXXJd5j6ePX3xy8Gjxz+ l+MtdOVQ//dPKeGiwCaTrWgwss2wNTHJdFVsmDw0BlVXjtZr/micl976OIx/pifMOO3stBdu/Hww1 6VBXjzZvZ1JtsF5JObAg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXllp-00070T-UZ; Mon, 03 Jun 2019 12:08:57 +0000 Received: from nbd.name ([2a01:4f8:221:3d45::2]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXllm-00070A-99 for ath11k@lists.infradead.org; Mon, 03 Jun 2019 12:08:56 +0000 Received: from p5dcfb250.dip0.t-ipconnect.de ([93.207.178.80] helo=bertha.fritz.box) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1hXllh-0007gh-2I; Mon, 03 Jun 2019 14:08:49 +0200 From: John Crispin To: Kalle Valo Subject: [PATCH] ath11k: fix various whitespace errors inside mac.h Date: Mon, 3 Jun 2019 14:08:43 +0200 Message-Id: <20190603120843.31616-1-john@phrozen.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190603_050854_481229_3DCA5E3C X-CRM114-Status: UNSURE ( 9.60 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ath11k@lists.infradead.org, John Crispin Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: John Crispin --- drivers/net/wireless/ath/ath11k/mac.h | 190 +++++++++++++------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h index 6f09c56c4eb9..842901ee3e2a 100644 --- a/drivers/net/wireless/ath/ath11k/mac.h +++ b/drivers/net/wireless/ath/ath11k/mac.h @@ -18,50 +18,50 @@ struct ath11k_generic_iter { }; /* number of failed packets (20 packets with 16 sw reties each) */ -#define ATH11K_KICKOUT_THRESHOLD (20 * 16) +#define ATH11K_KICKOUT_THRESHOLD (20 * 16) /* Use insanely high numbers to make sure that the firmware implementation * won't start, we have the same functionality already in hostapd. Unit * is seconds. */ -#define ATH11K_KEEPALIVE_MIN_IDLE 3747 -#define ATH11K_KEEPALIVE_MAX_IDLE 3895 -#define ATH11K_KEEPALIVE_MAX_UNRESPONSIVE 3900 - -#define WMI_HOST_RC_DS_FLAG 0x01 -#define WMI_HOST_RC_CW40_FLAG 0x02 -#define WMI_HOST_RC_SGI_FLAG 0x04 -#define WMI_HOST_RC_HT_FLAG 0x08 -#define WMI_HOST_RC_RTSCTS_FLAG 0x10 -#define WMI_HOST_RC_TX_STBC_FLAG 0x20 -#define WMI_HOST_RC_RX_STBC_FLAG 0xC0 -#define WMI_HOST_RC_RX_STBC_FLAG_S 6 -#define WMI_HOST_RC_WEP_TKIP_FLAG 0x100 -#define WMI_HOST_RC_TS_FLAG 0x200 -#define WMI_HOST_RC_UAPSD_FLAG 0x400 - -#define WMI_HT_CAP_ENABLED 0x0001 -#define WMI_HT_CAP_HT20_SGI 0x0002 -#define WMI_HT_CAP_DYNAMIC_SMPS 0x0004 -#define WMI_HT_CAP_TX_STBC 0x0008 -#define WMI_HT_CAP_TX_STBC_MASK_SHIFT 3 -#define WMI_HT_CAP_RX_STBC 0x0030 -#define WMI_HT_CAP_RX_STBC_MASK_SHIFT 4 -#define WMI_HT_CAP_LDPC 0x0040 -#define WMI_HT_CAP_L_SIG_TXOP_PROT 0x0080 -#define WMI_HT_CAP_MPDU_DENSITY 0x0700 -#define WMI_HT_CAP_MPDU_DENSITY_MASK_SHIFT 8 -#define WMI_HT_CAP_HT40_SGI 0x0800 -#define WMI_HT_CAP_RX_LDPC 0x1000 -#define WMI_HT_CAP_TX_LDPC 0x2000 -#define WMI_HT_CAP_IBF_BFER 0x4000 +#define ATH11K_KEEPALIVE_MIN_IDLE 3747 +#define ATH11K_KEEPALIVE_MAX_IDLE 3895 +#define ATH11K_KEEPALIVE_MAX_UNRESPONSIVE 3900 + +#define WMI_HOST_RC_DS_FLAG 0x01 +#define WMI_HOST_RC_CW40_FLAG 0x02 +#define WMI_HOST_RC_SGI_FLAG 0x04 +#define WMI_HOST_RC_HT_FLAG 0x08 +#define WMI_HOST_RC_RTSCTS_FLAG 0x10 +#define WMI_HOST_RC_TX_STBC_FLAG 0x20 +#define WMI_HOST_RC_RX_STBC_FLAG 0xC0 +#define WMI_HOST_RC_RX_STBC_FLAG_S 6 +#define WMI_HOST_RC_WEP_TKIP_FLAG 0x100 +#define WMI_HOST_RC_TS_FLAG 0x200 +#define WMI_HOST_RC_UAPSD_FLAG 0x400 + +#define WMI_HT_CAP_ENABLED 0x0001 +#define WMI_HT_CAP_HT20_SGI 0x0002 +#define WMI_HT_CAP_DYNAMIC_SMPS 0x0004 +#define WMI_HT_CAP_TX_STBC 0x0008 +#define WMI_HT_CAP_TX_STBC_MASK_SHIFT 3 +#define WMI_HT_CAP_RX_STBC 0x0030 +#define WMI_HT_CAP_RX_STBC_MASK_SHIFT 4 +#define WMI_HT_CAP_LDPC 0x0040 +#define WMI_HT_CAP_L_SIG_TXOP_PROT 0x0080 +#define WMI_HT_CAP_MPDU_DENSITY 0x0700 +#define WMI_HT_CAP_MPDU_DENSITY_MASK_SHIFT 8 +#define WMI_HT_CAP_HT40_SGI 0x0800 +#define WMI_HT_CAP_RX_LDPC 0x1000 +#define WMI_HT_CAP_TX_LDPC 0x2000 +#define WMI_HT_CAP_IBF_BFER 0x4000 /* These macros should be used when we wish to advertise STBC support for * only 1SS or 2SS or 3SS. */ -#define WMI_HT_CAP_RX_STBC_1SS 0x0010 -#define WMI_HT_CAP_RX_STBC_2SS 0x0020 -#define WMI_HT_CAP_RX_STBC_3SS 0x0030 +#define WMI_HT_CAP_RX_STBC_1SS 0x0010 +#define WMI_HT_CAP_RX_STBC_2SS 0x0020 +#define WMI_HT_CAP_RX_STBC_3SS 0x0030 #define WMI_HT_CAP_DEFAULT_ALL (WMI_HT_CAP_ENABLED | \ WMI_HT_CAP_HT20_SGI | \ @@ -70,34 +70,34 @@ struct ath11k_generic_iter { WMI_HT_CAP_RX_STBC | \ WMI_HT_CAP_LDPC) -#define WMI_VHT_CAP_MAX_MPDU_LEN_MASK 0x00000003 -#define WMI_VHT_CAP_RX_LDPC 0x00000010 -#define WMI_VHT_CAP_SGI_80MHZ 0x00000020 -#define WMI_VHT_CAP_SGI_160MHZ 0x00000040 -#define WMI_VHT_CAP_TX_STBC 0x00000080 -#define WMI_VHT_CAP_RX_STBC_MASK 0x00000300 -#define WMI_VHT_CAP_RX_STBC_MASK_SHIFT 8 -#define WMI_VHT_CAP_SU_BFER 0x00000800 -#define WMI_VHT_CAP_SU_BFEE 0x00001000 -#define WMI_VHT_CAP_MAX_CS_ANT_MASK 0x0000E000 -#define WMI_VHT_CAP_MAX_CS_ANT_MASK_SHIFT 13 -#define WMI_VHT_CAP_MAX_SND_DIM_MASK 0x00070000 -#define WMI_VHT_CAP_MAX_SND_DIM_MASK_SHIFT 16 -#define WMI_VHT_CAP_MU_BFER 0x00080000 -#define WMI_VHT_CAP_MU_BFEE 0x00100000 -#define WMI_VHT_CAP_MAX_AMPDU_LEN_EXP 0x03800000 -#define WMI_VHT_CAP_MAX_AMPDU_LEN_EXP_SHIT 23 -#define WMI_VHT_CAP_RX_FIXED_ANT 0x10000000 -#define WMI_VHT_CAP_TX_FIXED_ANT 0x20000000 - -#define WMI_VHT_CAP_MAX_MPDU_LEN_11454 0x00000002 +#define WMI_VHT_CAP_MAX_MPDU_LEN_MASK 0x00000003 +#define WMI_VHT_CAP_RX_LDPC 0x00000010 +#define WMI_VHT_CAP_SGI_80MHZ 0x00000020 +#define WMI_VHT_CAP_SGI_160MHZ 0x00000040 +#define WMI_VHT_CAP_TX_STBC 0x00000080 +#define WMI_VHT_CAP_RX_STBC_MASK 0x00000300 +#define WMI_VHT_CAP_RX_STBC_MASK_SHIFT 8 +#define WMI_VHT_CAP_SU_BFER 0x00000800 +#define WMI_VHT_CAP_SU_BFEE 0x00001000 +#define WMI_VHT_CAP_MAX_CS_ANT_MASK 0x0000E000 +#define WMI_VHT_CAP_MAX_CS_ANT_MASK_SHIFT 13 +#define WMI_VHT_CAP_MAX_SND_DIM_MASK 0x00070000 +#define WMI_VHT_CAP_MAX_SND_DIM_MASK_SHIFT 16 +#define WMI_VHT_CAP_MU_BFER 0x00080000 +#define WMI_VHT_CAP_MU_BFEE 0x00100000 +#define WMI_VHT_CAP_MAX_AMPDU_LEN_EXP 0x03800000 +#define WMI_VHT_CAP_MAX_AMPDU_LEN_EXP_SHIT 23 +#define WMI_VHT_CAP_RX_FIXED_ANT 0x10000000 +#define WMI_VHT_CAP_TX_FIXED_ANT 0x20000000 + +#define WMI_VHT_CAP_MAX_MPDU_LEN_11454 0x00000002 /* These macros should be used when we wish to advertise STBC support for * only 1SS or 2SS or 3SS. */ -#define WMI_VHT_CAP_RX_STBC_1SS 0x00000100 -#define WMI_VHT_CAP_RX_STBC_2SS 0x00000200 -#define WMI_VHT_CAP_RX_STBC_3SS 0x00000300 +#define WMI_VHT_CAP_RX_STBC_1SS 0x00000100 +#define WMI_VHT_CAP_RX_STBC_2SS 0x00000200 +#define WMI_VHT_CAP_RX_STBC_3SS 0x00000300 #define WMI_VHT_CAP_DEFAULT_ALL (WMI_VHT_CAP_MAX_MPDU_LEN_11454 | \ WMI_VHT_CAP_SGI_80MHZ | \ @@ -110,57 +110,57 @@ struct ath11k_generic_iter { /* VHT capability flags */ /* B0-B1 Maximum MPDU Length */ -#define IEEE80211_VHTCAP_MAX_MPDU_LEN_3839 0x00000000 -#define IEEE80211_VHTCAP_MAX_MPDU_LEN_7935 0x00000001 -#define IEEE80211_VHTCAP_MAX_MPDU_LEN_11454 0x00000002 +#define IEEE80211_VHTCAP_MAX_MPDU_LEN_3839 0x00000000 +#define IEEE80211_VHTCAP_MAX_MPDU_LEN_7935 0x00000001 +#define IEEE80211_VHTCAP_MAX_MPDU_LEN_11454 0x00000002 /* B2-B3 Supported Channel Width */ -#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_80 0x00000000 -#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_160 0x00000004 -#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_80_160 0x00000008 -#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_S 2 +#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_80 0x00000000 +#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_160 0x00000004 +#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_80_160 0x00000008 +#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_S 2 -#define IEEE80211_VHTCAP_RX_LDPC 0x00000010 -#define IEEE80211_VHTCAP_SHORTGI_80 0x00000020 -#define IEEE80211_VHTCAP_SHORTGI_160 0x00000040 -#define IEEE80211_VHTCAP_TX_STBC 0x00000080 -#define IEEE80211_VHTCAP_TX_STBC_S 7 +#define IEEE80211_VHTCAP_RX_LDPC 0x00000010 +#define IEEE80211_VHTCAP_SHORTGI_80 0x00000020 +#define IEEE80211_VHTCAP_SHORTGI_160 0x00000040 +#define IEEE80211_VHTCAP_TX_STBC 0x00000080 +#define IEEE80211_VHTCAP_TX_STBC_S 7 -#define IEEE80211_VHTCAP_RX_STBC 0x00000700 -#define IEEE80211_VHTCAP_RX_STBC_S 8 +#define IEEE80211_VHTCAP_RX_STBC 0x00000700 +#define IEEE80211_VHTCAP_RX_STBC_S 8 -#define IEEE80211_VHTCAP_SU_BFORMER 0x00000800 -#define IEEE80211_VHTCAP_SU_BFORMER_S 11 -#define IEEE80211_VHTCAP_SU_BFORMEE 0x00001000 -#define IEEE80211_VHTCAP_SU_BFORMEE_S 12 +#define IEEE80211_VHTCAP_SU_BFORMER 0x00000800 +#define IEEE80211_VHTCAP_SU_BFORMER_S 11 +#define IEEE80211_VHTCAP_SU_BFORMEE 0x00001000 +#define IEEE80211_VHTCAP_SU_BFORMEE_S 12 -#define IEEE80211_VHTCAP_BF_MAX_ANT 0x0000E000 -#define IEEE80211_VHTCAP_BF_MAX_ANT_S 13 +#define IEEE80211_VHTCAP_BF_MAX_ANT 0x0000E000 +#define IEEE80211_VHTCAP_BF_MAX_ANT_S 13 -#define IEEE80211_VHTCAP_STS_CAP_S 13 -#define IEEE80211_VHTCAP_STS_CAP_M 0x7 +#define IEEE80211_VHTCAP_STS_CAP_S 13 +#define IEEE80211_VHTCAP_STS_CAP_M 0x7 -#define IEEE80211_VHTCAP_SOUND_DIM 0x00070000 -#define IEEE80211_VHTCAP_SOUND_DIM_S 16 +#define IEEE80211_VHTCAP_SOUND_DIM 0x00070000 +#define IEEE80211_VHTCAP_SOUND_DIM_S 16 -#define IEEE80211_VHTCAP_MU_BFORMER 0x00080000 -#define IEEE80211_VHTCAP_MU_BFORMER_S 19 -#define IEEE80211_VHTCAP_MU_BFORMEE 0x00100000 -#define IEEE80211_VHTCAP_MU_BFORMEE_S 20 -#define IEEE80211_VHTCAP_TXOP_PS 0x00200000 -#define IEEE80211_VHTCAP_PLUS_HTC_VHT 0x00400000 +#define IEEE80211_VHTCAP_MU_BFORMER 0x00080000 +#define IEEE80211_VHTCAP_MU_BFORMER_S 19 +#define IEEE80211_VHTCAP_MU_BFORMEE 0x00100000 +#define IEEE80211_VHTCAP_MU_BFORMEE_S 20 +#define IEEE80211_VHTCAP_TXOP_PS 0x00200000 +#define IEEE80211_VHTCAP_PLUS_HTC_VHT 0x00400000 -#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_FACTOR 13 -#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_EXP 0x03800000 -#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_EXP_S 23 +#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_FACTOR 13 +#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_EXP 0x03800000 +#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_EXP_S 23 -#define IEEE80211_VHTCAP_LINK_ADAPT 0x0C000000 -#define IEEE80211_VHTCAP_RESERVED 0xF0000000 +#define IEEE80211_VHTCAP_LINK_ADAPT 0x0C000000 +#define IEEE80211_VHTCAP_RESERVED 0xF0000000 #define IEEE80211_VHT_MCS_SUPPORT_0_11_MASK GENMASK(23, 16) #define IEEE80211_DISABLE_VHT_MCS_SUPPORT_0_11 BIT(24) -#define WMI_MAX_SPATIAL_STREAM 3 +#define WMI_MAX_SPATIAL_STREAM 3 int ath11k_mac_create(struct ath11k_base *ab); void ath11k_mac_destroy(struct ath11k_base *ab);