| Message ID | 20190417003547.26271-1-Larry.Finger@lwfinger.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b5250c9c14c139f467a935a4b7edfcf202772c52 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | rtlwifi: rtl8188ee: Remove extraneous file | expand |
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 <Larry.Finger@lwfinger.net> > Reported-by: Andrew Morton <akpm@linux-foundation.org> > Cc: Andrew Morton <akpm@linux-foundation.org> > --- > 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?
Larry Finger <Larry.Finger@lwfinger.net> 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 <Larry.Finger@lwfinger.net> > Reported-by: Andrew Morton <akpm@linux-foundation.org> > Cc: Andrew Morton <akpm@linux-foundation.org> > --- > 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' $
On 4/16/19 9:55 PM, Kalle Valo wrote: > Larry Finger <Larry.Finger@lwfinger.net> 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 <Larry.Finger@lwfinger.net> >> Reported-by: Andrew Morton <akpm@linux-foundation.org> >> Cc: Andrew Morton <akpm@linux-foundation.org> >> --- >> 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
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 <Larry.Finger@lwfinger.net> >> Reported-by: Andrew Morton <akpm@linux-foundation.org> >> Cc: Andrew Morton <akpm@linux-foundation.org> >> --- >> 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 > >
Larry Finger <Larry.Finger@lwfinger.net> writes: > On 4/16/19 9:55 PM, Kalle Valo wrote: >> Larry Finger <Larry.Finger@lwfinger.net> 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 <Larry.Finger@lwfinger.net> >>> Reported-by: Andrew Morton <akpm@linux-foundation.org> >>> Cc: Andrew Morton <akpm@linux-foundation.org> >>> --- >>> 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.
Larry Finger <Larry.Finger@lwfinger.net> 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 <Larry.Finger@lwfinger.net> > Reported-by: Andrew Morton <akpm@linux-foundation.org> > Cc: Andrew Morton <akpm@linux-foundation.org> Patch applied to wireless-drivers-next.git, thanks. b5250c9c14c1 rtlwifi: rtl8188ee: Remove extraneous file
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)
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 <Larry.Finger@lwfinger.net> Reported-by: Andrew Morton <akpm@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> --- 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