2019-04-17 00:35:57

by Larry Finger

Subject: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file

Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was
incorporated into the sources. Obviously, it can be removed.

Signed-off-by: Larry Finger <[email protected]>
Reported-by: Andrew Morton <[email protected]>
Cc: Andrew Morton <[email protected]>
---
Andrew,

Thanks.

Larry
---
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
deleted file mode 100644
index aa03d4605d8c..000000000000
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
-+++ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
-@@ -373,6 +373,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
- struct rx_fwinfo_88e *p_drvinfo;
- struct ieee80211_hdr *hdr;
- u32 phystatus = GET_RX_DESC_PHYST(pdesc);
-+ u8 wake_match;
-
- status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);
- if (status->packet_report_type == TX_REPORT2)
--
2.16.4

2019-04-17 01:35:11

by Ping-Ke Shih

Subject: Re: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file

On Tue, 2019-04-16 at 19:35 -0500, Larry Finger wrote:
> Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was
> incorporated into the sources. Obviously, it can be removed.
>
> Signed-off-by: Larry Finger <[email protected]>
> Reported-by: Andrew Morton <[email protected]>
> Cc: Andrew Morton <[email protected]>
> ---
> Andrew,
>
> Thanks.
>
> Larry
> ---
>  drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ----------
>  1 file changed, 10 deletions(-)
>  delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
> b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
> deleted file mode 100644
> index aa03d4605d8c..000000000000
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
> -+++ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
> -@@ -373,6 +373,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
> -  struct rx_fwinfo_88e *p_drvinfo;
> -  struct ieee80211_hdr *hdr;
> -  u32 phystatus = GET_RX_DESC_PHYST(pdesc);
> -+ u8 wake_match;
> - 
> -  status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);
> -  if (status->packet_report_type == TX_REPORT2)

The change of trx.c seems not belong to this patch, right? 

2019-04-17 02:55:22

by Kalle Valo

Subject: Re: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file

Larry Finger <[email protected]> writes:

> Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was
> incorporated into the sources. Obviously, it can be removed.
>
> Signed-off-by: Larry Finger <[email protected]>
> Reported-by: Andrew Morton <[email protected]>
> Cc: Andrew Morton <[email protected]>
> ---
> Andrew,
>
> Thanks.
>
> Larry
> ---
> drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ----------
> 1 file changed, 10 deletions(-)
> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
> b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
> deleted file mode 100644
> index aa03d4605d8c..000000000000
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
> +++ /dev/null

What tree is this? On wireless-drivers I can't find this file:

$ ls drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
/bin/ls: cannot access 'drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej': No such file or directory
$

Actually I cannot find any .rej files:

$ find -name '*.rej'
$

--
Kalle Valo

2019-04-17 12:37:57

by Larry Finger

Subject: Re: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file

On 4/16/19 9:55 PM, Kalle Valo wrote:
> Larry Finger <[email protected]> writes:
>
>> Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was
>> incorporated into the sources. Obviously, it can be removed.
>>
>> Signed-off-by: Larry Finger <[email protected]>
>> Reported-by: Andrew Morton <[email protected]>
>> Cc: Andrew Morton <[email protected]>
>> ---
>> Andrew,
>>
>> Thanks.
>>
>> Larry
>> ---
>> drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ----------
>> 1 file changed, 10 deletions(-)
>> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>>
>> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>> b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>> deleted file mode 100644
>> index aa03d4605d8c..000000000000
>> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>> +++ /dev/null
>
> What tree is this? On wireless-drivers I can't find this file:
>
> $ ls drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
> /bin/ls: cannot access 'drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej': No such file or directory
> $
>
> Actually I cannot find any .rej files:
>
> $ find -name '*.rej'
> $
>

It is in wireless-drivers-next. This extraneous file was added in commit
05f1be9594d5 ("rtlwifi: Convert the wake_match variable to local").

Larry

2019-04-17 12:39:38

by Larry Finger

Subject: Re: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file

On 4/16/19 8:34 PM, Pkshih wrote:
> On Tue, 2019-04-16 at 19:35 -0500, Larry Finger wrote:
>> Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was
>> incorporated into the sources. Obviously, it can be removed.
>>
>> Signed-off-by: Larry Finger <[email protected]>
>> Reported-by: Andrew Morton <[email protected]>
>> Cc: Andrew Morton <[email protected]>
>> ---
>> Andrew,
>>
>> Thanks.
>>
>> Larry
>> ---
>>  drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ----------
>>  1 file changed, 10 deletions(-)
>>  delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>>
>> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>> b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>> deleted file mode 100644
>> index aa03d4605d8c..000000000000
>> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>> +++ /dev/null
>> @@ -1,10 +0,0 @@
>> ---- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
>> -+++ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
>> -@@ -373,6 +373,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw,
>> -  struct rx_fwinfo_88e *p_drvinfo;
>> -  struct ieee80211_hdr *hdr;
>> -  u32 phystatus = GET_RX_DESC_PHYST(pdesc);
>> -+ u8 wake_match;
>> -
>> -  status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc);
>> -  if (status->packet_report_type == TX_REPORT2)
>
> The change of trx.c seems not belong to this patch, right?

That is correct. The change in trx.c was correctly done except for incorporation
of the extraneous file.

Larry

>
>

2019-04-17 14:15:48

by Kalle Valo

Subject: Re: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file

Larry Finger <[email protected]> writes:

> On 4/16/19 9:55 PM, Kalle Valo wrote:
>> Larry Finger <[email protected]> writes:
>>
>>> Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was
>>> incorporated into the sources. Obviously, it can be removed.
>>>
>>> Signed-off-by: Larry Finger <[email protected]>
>>> Reported-by: Andrew Morton <[email protected]>
>>> Cc: Andrew Morton <[email protected]>
>>> ---
>>> Andrew,
>>>
>>> Thanks.
>>>
>>> Larry
>>> ---
>>> drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ----------
>>> 1 file changed, 10 deletions(-)
>>> delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>>>
>>> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>>> b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>>> deleted file mode 100644
>>> index aa03d4605d8c..000000000000
>>> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>>> +++ /dev/null
>>
>> What tree is this? On wireless-drivers I can't find this file:
>>
>> $ ls drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej
>> /bin/ls: cannot access
>> 'drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej': No such
>> file or directory
>> $
>>
>> Actually I cannot find any .rej files:
>>
>> $ find -name '*.rej'
>> $
>>
>
> It is in wireless-drivers-next. This extraneous file was added in
> commit 05f1be9594d5 ("rtlwifi: Convert the wake_match variable to
> local").

Ah, now I see it. But I think the commit adding was:

ddab2eee7949 rtlwifi: Convert the wake_match variable to local

I'll queue this for w-d-next.

--
Kalle Valo

2019-04-18 13:08:52

by Kalle Valo

Subject: Re: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file

Larry Finger <[email protected]> wrote:

> Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was
> incorporated into the sources. Obviously, it can be removed.
>
> Signed-off-by: Larry Finger <[email protected]>
> Reported-by: Andrew Morton <[email protected]>
> Cc: Andrew Morton <[email protected]>

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

b5250c9c14c1 rtlwifi: rtl8188ee: Remove extraneous file

--
https://patchwork.kernel.org/patch/10904279/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches