rtlwifi: fix REG_USTIME_TSF register definition

Message ID	20170519150240.GA47825@ns.kevlo.org (mailing list archive)
State	Accepted
Commit	9da96c5e7edd38f8f7457d86efb60d0e8a07191f
Delegated to:	Kalle Valo
Headers	show Return-Path: <linux-wireless-owner@kernel.org> Date: Fri, 19 May 2017 23:02:40 +0800 From: Kevin Lo <kevlo@kevlo.org> To: Larry Finger <Larry.Finger@lwfinger.net>, Ping-Ke Shih <pkshih@realtek.com>, linux-wireless@vger.kernel.org Subject: [PATCH] rtlwifi: fix REG_USTIME_TSF register definition Message-ID: <20170519150240.GA47825@ns.kevlo.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk

Message ID

20170519150240.GA47825@ns.kevlo.org (mailing list archive)

State

Accepted

Commit

9da96c5e7edd38f8f7457d86efb60d0e8a07191f

Delegated to:

Kalle Valo

Headers

show

Return-Path: <linux-wireless-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
	[172.30.200.125])
	by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id
	845B16034C for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 19 May 2017 15:13:50 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A64028898
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 19 May 2017 15:13:50 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 6D727288F4; Fri, 19 May 2017 15:13:50 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI
	autolearn=ham version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA32028898
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 19 May 2017 15:13:49 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754829AbdESPNr (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Fri, 19 May 2017 11:13:47 -0400
Received: from 220-135-115-6.HINET-IP.hinet.net ([220.135.115.6]:37684 "EHLO
	ns.kevlo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with
	ESMTP
	id S1754402AbdESPNr (ORCPT <rfc822; linux-wireless@vger.kernel.org>); 
	Fri, 19 May 2017 11:13:47 -0400
X-Greylist: delayed 548 seconds by postgrey-1.27 at vger.kernel.org;
	Fri, 19 May 2017 11:13:44 EDT
Received: from ns.kevlo.org (localhost [127.0.0.1])
	by ns.kevlo.org (8.15.2/8.15.2) with ESMTPS id v4JF2fMx047842
	(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
	Fri, 19 May 2017 23:02:42 +0800 (CST)
	(envelope-from kevlo@ns.kevlo.org)
Received: (from kevlo@localhost)
	by ns.kevlo.org (8.15.2/8.15.2/Submit) id v4JF2fED047839;
	Fri, 19 May 2017 23:02:41 +0800 (CST) (envelope-from kevlo)
Date: Fri, 19 May 2017 23:02:40 +0800
From: Kevin Lo <kevlo@kevlo.org>
To: Larry Finger <Larry.Finger@lwfinger.net>,
	Ping-Ke Shih <pkshih@realtek.com>, linux-wireless@vger.kernel.org
Subject: [PATCH] rtlwifi: fix REG_USTIME_TSF register definition
Message-ID: <20170519150240.GA47825@ns.kevlo.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.8.0 (2017-02-23)
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

Comments

Kalle Valo May 24, 2017, 8:46 a.m. UTC | #1

Kevin Lo <kevlo@kevlo.org> wrote:
> The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips
> should be 0x55C.
> 
> Signed-off-by: Kevin Lo <kevlo@kevlo.org>

Larry, is this ok to take?

Kevin Lo June 10, 2017, 2:23 p.m. UTC | #2

Sorry for the top post.  This patch has an Acked-by Yan-Hsuan Chuang.

On Wed, Jun 07, 2017 at 09:43:21AM +0800, 莊彥宣 wrote:
> Yes, the register 0x55c is for REG_USTIME_TSF.
> And 0x551 is for BCN_CTRL1.
> 
> 
> Acked-by: Yan-Hsuan, Chuang <yhchuang@realtek.com>
> 
> 2017-05-19 23:02 GMT+08:00 Kevin Lo <kevlo@kevlo.org>:
> 
> > The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips
> > should be 0x55C.
> >
> > Signed-off-by: Kevin Lo <kevlo@kevlo.org>
> > ---
> >
> > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
> > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
> > index 15400ee6c04b..0c0d64aea651 100644
> > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
> > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
> > @@ -248,7 +248,6 @@
> >  #define REG_RD_NAV_NXT                         0x0544
> >  #define REG_NAV_PROT_LEN                       0x0546
> >  #define REG_BCN_CTRL                           0x0550
> > -#define REG_USTIME_TSF                         0x0551
> >  #define REG_MBID_NUM                           0x0552
> >  #define REG_DUAL_TSF_RST                       0x0553
> >  #define REG_BCN_INTERVAL                       0x0554
> > @@ -256,6 +255,7 @@
> >  #define REG_DRVERLYINT                         0x0558
> >  #define REG_BCNDMATIM                          0x0559
> >  #define REG_ATIMWND                                    0x055A
> > +#define REG_USTIME_TSF                         0x055C
> >  #define REG_BCN_MAX_ERR                                0x055D
> >  #define REG_RXTSF_OFFSET_CCK           0x055E
> >  #define REG_RXTSF_OFFSET_OFDM          0x055F
> > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
> > b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
> > index 1bb7ed35812d..9e3b58a5d2bb 100644
> > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
> > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
> > @@ -227,7 +227,6 @@
> >  #define REG_RD_NAV_NXT                         0x0544
> >  #define REG_NAV_PROT_LEN                       0x0546
> >  #define REG_BCN_CTRL                           0x0550
> > -#define REG_USTIME_TSF                         0x0551
> >  #define REG_MBID_NUM                           0x0552
> >  #define REG_DUAL_TSF_RST                       0x0553
> >  #define REG_BCN_INTERVAL                       0x0554
> > @@ -235,6 +234,7 @@
> >  #define REG_DRVERLYINT                         0x0558
> >  #define REG_BCNDMATIM                          0x0559
> >  #define REG_ATIMWND                            0x055A
> > +#define REG_USTIME_TSF                         0x055C
> >  #define REG_BCN_MAX_ERR                                0x055D
> >  #define REG_RXTSF_OFFSET_CCK                   0x055E
> >  #define REG_RXTSF_OFFSET_OFDM                  0x055F
> > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
> > b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
> > index b354b95936e2..d4c4e76a9244 100644
> > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
> > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
> > @@ -255,7 +255,6 @@
> >  #define REG_RD_NAV_NXT                 0x0544
> >  #define REG_NAV_PROT_LEN               0x0546
> >  #define REG_BCN_CTRL                   0x0550
> > -#define REG_USTIME_TSF                 0x0551
> >  #define REG_MBID_NUM                   0x0552
> >  #define REG_DUAL_TSF_RST               0x0553
> >  #define REG_BCN_INTERVAL               0x0554
> > @@ -263,6 +262,7 @@
> >  #define REG_DRVERLYINT                 0x0558
> >  #define REG_BCNDMATIM                  0x0559
> >  #define REG_ATIMWND                    0x055A
> > +#define REG_USTIME_TSF                 0x055C
> >  #define REG_BCN_MAX_ERR                        0x055D
> >  #define REG_RXTSF_OFFSET_CCK           0x055E
> >  #define REG_RXTSF_OFFSET_OFDM          0x055F
> > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
> > b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
> > index 306059f9b9cc..30938cd9fce5 100644
> > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
> > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
> > @@ -217,7 +217,6 @@
> >  #define REG_RD_NAV_NXT                         0x0544
> >  #define REG_NAV_PROT_LEN                       0x0546
> >  #define REG_BCN_CTRL                           0x0550
> > -#define REG_USTIME_TSF                         0x0551
> >  #define REG_MBID_NUM                           0x0552
> >  #define REG_DUAL_TSF_RST                       0x0553
> >  #define REG_BCN_INTERVAL                       0x0554
> > @@ -225,6 +224,7 @@
> >  #define REG_DRVERLYINT                         0x0558
> >  #define REG_BCNDMATIM                          0x0559
> >  #define REG_ATIMWND                                    0x055A
> > +#define REG_USTIME_TSF                         0x055C
> >  #define REG_BCN_MAX_ERR                                0x055D
> >  #define REG_RXTSF_OFFSET_CCK           0x055E
> >  #define REG_RXTSF_OFFSET_OFDM          0x055F
> > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
> > b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
> > index 03581d2a5da0..95c4f8e206c7 100644
> > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
> > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
> > @@ -261,7 +261,6 @@
> >  #define REG_RD_NAV_NXT                         0x0544
> >  #define REG_NAV_PROT_LEN                       0x0546
> >  #define REG_BCN_CTRL                           0x0550
> > -#define REG_USTIME_TSF                         0x0551
> >  #define REG_MBID_NUM                           0x0552
> >  #define REG_DUAL_TSF_RST                       0x0553
> >  #define REG_BCN_INTERVAL                       0x0554
> > @@ -269,6 +268,7 @@
> >  #define REG_DRVERLYINT                         0x0558
> >  #define REG_BCNDMATIM                          0x0559
> >  #define REG_ATIMWND                            0x055A
> > +#define REG_USTIME_TSF                         0x055C
> >  #define REG_BCN_MAX_ERR                                0x055D
> >  #define REG_RXTSF_OFFSET_CCK                   0x055E
> >  #define REG_RXTSF_OFFSET_OFDM                  0x055F
> > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
> > b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
> > index ed69dbe178ff..db8bc8a2de61 100644
> > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
> > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
> > @@ -267,7 +267,6 @@
> >  #define REG_RD_NAV_NXT                         0x0544
> >  #define REG_NAV_PROT_LEN                       0x0546
> >  #define REG_BCN_CTRL                           0x0550
> > -#define REG_USTIME_TSF                         0x0551
> >  #define REG_MBID_NUM                           0x0552
> >  #define REG_DUAL_TSF_RST                       0x0553
> >  #define REG_BCN_INTERVAL                       0x0554
> > @@ -275,6 +274,7 @@
> >  #define REG_DRVERLYINT                         0x0558
> >  #define REG_BCNDMATIM                          0x0559
> >  #define REG_ATIMWND                            0x055A
> > +#define REG_USTIME_TSF                         0x055C
> >  #define REG_BCN_MAX_ERR                                0x055D
> >  #define REG_RXTSF_OFFSET_CCK                   0x055E
> >  #define REG_RXTSF_OFFSET_OFDM                  0x055F
> >

Kalle Valo June 11, 2017, 8:18 a.m. UTC | #3

Kevin Lo <kevlo@kevlo.org> writes:

> Sorry for the top post.  This patch has an Acked-by Yan-Hsuan Chuang.
>
> On Wed, Jun 07, 2017 at 09:43:21AM +0800, 莊彥宣 wrote:
>> Yes, the register 0x55c is for REG_USTIME_TSF.
>> And 0x551 is for BCN_CTRL1.
>> 
>> 
>> Acked-by: Yan-Hsuan, Chuang <yhchuang@realtek.com>
>> 
>> 2017-05-19 23:02 GMT+08:00 Kevin Lo <kevlo@kevlo.org>:
>> 
>> > The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips
>> > should be 0x55C.
>> >
>> > Signed-off-by: Kevin Lo <kevlo@kevlo.org>

I don't see Yan-Hsuan's ack on the mailing list (maybe it was dropped
because of HTML?) and hence neither in patchwork:

https://patchwork.kernel.org/patch/9737421/

Yan-Hsuan or Larry, can you please resend the ack so that patchwork sees
it?

Kevin Lo June 11, 2017, 1:24 p.m. UTC | #4

On Sun, Jun 11, 2017 at 11:18:38AM +0300, Kalle Valo wrote:
> 
> Kevin Lo <kevlo@kevlo.org> writes:
> 
> > Sorry for the top post.  This patch has an Acked-by Yan-Hsuan Chuang.
> >
> > On Wed, Jun 07, 2017 at 09:43:21AM +0800, 莊彥宣 wrote:
> >> Yes, the register 0x55c is for REG_USTIME_TSF.
> >> And 0x551 is for BCN_CTRL1.
> >> 
> >> 
> >> Acked-by: Yan-Hsuan, Chuang <yhchuang@realtek.com>
> >> 
> >> 2017-05-19 23:02 GMT+08:00 Kevin Lo <kevlo@kevlo.org>:
> >> 
> >> > The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips
> >> > should be 0x55C.
> >> >
> >> > Signed-off-by: Kevin Lo <kevlo@kevlo.org>
> 
> I don't see Yan-Hsuan's ack on the mailing list (maybe it was dropped
> because of HTML?) and hence neither in patchwork:
> 
> https://patchwork.kernel.org/patch/9737421/

Yan-Hsuan replied privately to me.  I think he forgot to cc linux-wireless@.

> Yan-Hsuan or Larry, can you please resend the ack so that patchwork sees
> it?
> 
> -- 
> Kalle Valo

Kalle Valo June 21, 2017, 3:24 p.m. UTC | #5

Kevin Lo <kevlo@kevlo.org> wrote:

> The REG_USTIME_TSF (US Time Tuning for TSF) definition of Realtek chips
> should be 0x55C.
> 
> Signed-off-by: Kevin Lo <kevlo@kevlo.org>
> 
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
> index 15400ee6c04b..0c0d64aea651 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
> @@ -248,7 +248,6 @@
>  #define REG_RD_NAV_NXT				0x0544
>  #define REG_NAV_PROT_LEN			0x0546
>  #define REG_BCN_CTRL				0x0550
> -#define REG_USTIME_TSF				0x0551
>  #define REG_MBID_NUM				0x0552
>  #define REG_DUAL_TSF_RST			0x0553
>  #define REG_BCN_INTERVAL			0x0554
> @@ -256,6 +255,7 @@
>  #define REG_DRVERLYINT				0x0558
>  #define REG_BCNDMATIM				0x0559
>  #define REG_ATIMWND					0x055A
> +#define REG_USTIME_TSF				0x055C
>  #define REG_BCN_MAX_ERR				0x055D
>  #define REG_RXTSF_OFFSET_CCK		0x055E
>  #define REG_RXTSF_OFFSET_OFDM		0x055F
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
> index 1bb7ed35812d..9e3b58a5d2bb 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
> @@ -227,7 +227,6 @@
>  #define REG_RD_NAV_NXT				0x0544
>  #define REG_NAV_PROT_LEN			0x0546
>  #define REG_BCN_CTRL				0x0550
> -#define REG_USTIME_TSF				0x0551
>  #define REG_MBID_NUM				0x0552
>  #define REG_DUAL_TSF_RST			0x0553
>  #define REG_BCN_INTERVAL			0x0554
> @@ -235,6 +234,7 @@
>  #define REG_DRVERLYINT				0x0558
>  #define REG_BCNDMATIM				0x0559
>  #define REG_ATIMWND				0x055A
> +#define REG_USTIME_TSF				0x055C
>  #define REG_BCN_MAX_ERR				0x055D
>  #define REG_RXTSF_OFFSET_CCK			0x055E
>  #define REG_RXTSF_OFFSET_OFDM			0x055F
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
> index b354b95936e2..d4c4e76a9244 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
> @@ -255,7 +255,6 @@
>  #define REG_RD_NAV_NXT			0x0544
>  #define REG_NAV_PROT_LEN		0x0546
>  #define REG_BCN_CTRL			0x0550
> -#define REG_USTIME_TSF			0x0551
>  #define REG_MBID_NUM			0x0552
>  #define REG_DUAL_TSF_RST		0x0553
>  #define REG_BCN_INTERVAL		0x0554
> @@ -263,6 +262,7 @@
>  #define REG_DRVERLYINT			0x0558
>  #define REG_BCNDMATIM			0x0559
>  #define REG_ATIMWND			0x055A
> +#define REG_USTIME_TSF			0x055C
>  #define REG_BCN_MAX_ERR			0x055D
>  #define REG_RXTSF_OFFSET_CCK		0x055E
>  #define REG_RXTSF_OFFSET_OFDM		0x055F
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
> index 306059f9b9cc..30938cd9fce5 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
> @@ -217,7 +217,6 @@
>  #define REG_RD_NAV_NXT				0x0544
>  #define REG_NAV_PROT_LEN			0x0546
>  #define REG_BCN_CTRL				0x0550
> -#define REG_USTIME_TSF				0x0551
>  #define REG_MBID_NUM				0x0552
>  #define REG_DUAL_TSF_RST			0x0553
>  #define REG_BCN_INTERVAL			0x0554
> @@ -225,6 +224,7 @@
>  #define REG_DRVERLYINT				0x0558
>  #define REG_BCNDMATIM				0x0559
>  #define REG_ATIMWND					0x055A
> +#define REG_USTIME_TSF				0x055C
>  #define REG_BCN_MAX_ERR				0x055D
>  #define REG_RXTSF_OFFSET_CCK		0x055E
>  #define REG_RXTSF_OFFSET_OFDM		0x055F
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
> index 03581d2a5da0..95c4f8e206c7 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
> @@ -261,7 +261,6 @@
>  #define REG_RD_NAV_NXT				0x0544
>  #define REG_NAV_PROT_LEN			0x0546
>  #define REG_BCN_CTRL				0x0550
> -#define REG_USTIME_TSF				0x0551
>  #define REG_MBID_NUM				0x0552
>  #define REG_DUAL_TSF_RST			0x0553
>  #define REG_BCN_INTERVAL			0x0554
> @@ -269,6 +268,7 @@
>  #define REG_DRVERLYINT				0x0558
>  #define REG_BCNDMATIM				0x0559
>  #define REG_ATIMWND				0x055A
> +#define REG_USTIME_TSF				0x055C
>  #define REG_BCN_MAX_ERR				0x055D
>  #define REG_RXTSF_OFFSET_CCK			0x055E
>  #define REG_RXTSF_OFFSET_OFDM			0x055F
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
> index ed69dbe178ff..db8bc8a2de61 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
> @@ -267,7 +267,6 @@
>  #define REG_RD_NAV_NXT				0x0544
>  #define REG_NAV_PROT_LEN			0x0546
>  #define REG_BCN_CTRL				0x0550
> -#define REG_USTIME_TSF				0x0551
>  #define REG_MBID_NUM				0x0552
>  #define REG_DUAL_TSF_RST			0x0553
>  #define REG_BCN_INTERVAL			0x0554
> @@ -275,6 +274,7 @@
>  #define REG_DRVERLYINT				0x0558
>  #define REG_BCNDMATIM				0x0559
>  #define REG_ATIMWND				0x055A
> +#define REG_USTIME_TSF				0x055C
>  #define REG_BCN_MAX_ERR				0x055D
>  #define REG_RXTSF_OFFSET_CCK			0x055E
>  #define REG_RXTSF_OFFSET_OFDM			0x055F

Patch applied to wireless-drivers-next.git, thanks.

9da96c5e7edd rtlwifi: fix REG_USTIME_TSF register definition

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
index 15400ee6c04b..0c0d64aea651 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
@@ -248,7 +248,6 @@ 
 #define REG_RD_NAV_NXT				0x0544
 #define REG_NAV_PROT_LEN			0x0546
 #define REG_BCN_CTRL				0x0550
-#define REG_USTIME_TSF				0x0551
 #define REG_MBID_NUM				0x0552
 #define REG_DUAL_TSF_RST			0x0553
 #define REG_BCN_INTERVAL			0x0554
@@ -256,6 +255,7 @@ 
 #define REG_DRVERLYINT				0x0558
 #define REG_BCNDMATIM				0x0559
 #define REG_ATIMWND					0x055A
+#define REG_USTIME_TSF				0x055C
 #define REG_BCN_MAX_ERR				0x055D
 #define REG_RXTSF_OFFSET_CCK		0x055E
 #define REG_RXTSF_OFFSET_OFDM		0x055F
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
index 1bb7ed35812d..9e3b58a5d2bb 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h
@@ -227,7 +227,6 @@ 
 #define REG_RD_NAV_NXT				0x0544
 #define REG_NAV_PROT_LEN			0x0546
 #define REG_BCN_CTRL				0x0550
-#define REG_USTIME_TSF				0x0551
 #define REG_MBID_NUM				0x0552
 #define REG_DUAL_TSF_RST			0x0553
 #define REG_BCN_INTERVAL			0x0554
@@ -235,6 +234,7 @@ 
 #define REG_DRVERLYINT				0x0558
 #define REG_BCNDMATIM				0x0559
 #define REG_ATIMWND				0x055A
+#define REG_USTIME_TSF				0x055C
 #define REG_BCN_MAX_ERR				0x055D
 #define REG_RXTSF_OFFSET_CCK			0x055E
 #define REG_RXTSF_OFFSET_OFDM			0x055F
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
index b354b95936e2..d4c4e76a9244 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h
@@ -255,7 +255,6 @@ 
 #define REG_RD_NAV_NXT			0x0544
 #define REG_NAV_PROT_LEN		0x0546
 #define REG_BCN_CTRL			0x0550
-#define REG_USTIME_TSF			0x0551
 #define REG_MBID_NUM			0x0552
 #define REG_DUAL_TSF_RST		0x0553
 #define REG_BCN_INTERVAL		0x0554
@@ -263,6 +262,7 @@ 
 #define REG_DRVERLYINT			0x0558
 #define REG_BCNDMATIM			0x0559
 #define REG_ATIMWND			0x055A
+#define REG_USTIME_TSF			0x055C
 #define REG_BCN_MAX_ERR			0x055D
 #define REG_RXTSF_OFFSET_CCK		0x055E
 #define REG_RXTSF_OFFSET_OFDM		0x055F
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
index 306059f9b9cc..30938cd9fce5 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/reg.h
@@ -217,7 +217,6 @@ 
 #define REG_RD_NAV_NXT				0x0544
 #define REG_NAV_PROT_LEN			0x0546
 #define REG_BCN_CTRL				0x0550
-#define REG_USTIME_TSF				0x0551
 #define REG_MBID_NUM				0x0552
 #define REG_DUAL_TSF_RST			0x0553
 #define REG_BCN_INTERVAL			0x0554
@@ -225,6 +224,7 @@ 
 #define REG_DRVERLYINT				0x0558
 #define REG_BCNDMATIM				0x0559
 #define REG_ATIMWND					0x055A
+#define REG_USTIME_TSF				0x055C
 #define REG_BCN_MAX_ERR				0x055D
 #define REG_RXTSF_OFFSET_CCK		0x055E
 #define REG_RXTSF_OFFSET_OFDM		0x055F
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
index 03581d2a5da0..95c4f8e206c7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/reg.h
@@ -261,7 +261,6 @@ 
 #define REG_RD_NAV_NXT				0x0544
 #define REG_NAV_PROT_LEN			0x0546
 #define REG_BCN_CTRL				0x0550
-#define REG_USTIME_TSF				0x0551
 #define REG_MBID_NUM				0x0552
 #define REG_DUAL_TSF_RST			0x0553
 #define REG_BCN_INTERVAL			0x0554
@@ -269,6 +268,7 @@ 
 #define REG_DRVERLYINT				0x0558
 #define REG_BCNDMATIM				0x0559
 #define REG_ATIMWND				0x055A
+#define REG_USTIME_TSF				0x055C
 #define REG_BCN_MAX_ERR				0x055D
 #define REG_RXTSF_OFFSET_CCK			0x055E
 #define REG_RXTSF_OFFSET_OFDM			0x055F
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
index ed69dbe178ff..db8bc8a2de61 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/reg.h
@@ -267,7 +267,6 @@ 
 #define REG_RD_NAV_NXT				0x0544
 #define REG_NAV_PROT_LEN			0x0546
 #define REG_BCN_CTRL				0x0550
-#define REG_USTIME_TSF				0x0551
 #define REG_MBID_NUM				0x0552
 #define REG_DUAL_TSF_RST			0x0553
 #define REG_BCN_INTERVAL			0x0554
@@ -275,6 +274,7 @@ 
 #define REG_DRVERLYINT				0x0558
 #define REG_BCNDMATIM				0x0559
 #define REG_ATIMWND				0x055A
+#define REG_USTIME_TSF				0x055C
 #define REG_BCN_MAX_ERR				0x055D
 #define REG_RXTSF_OFFSET_CCK			0x055E
 #define REG_RXTSF_OFFSET_OFDM			0x055F

rtlwifi: fix REG_USTIME_TSF register definition

Commit Message

Comments

Patch