summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/realtek
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2019-04-17 02:35:47 +0200
committerKalle Valo <kvalo@codeaurora.org>2019-04-18 15:08:23 +0200
commitb5250c9c14c139f467a935a4b7edfcf202772c52 (patch)
tree11be2b136e0ca64efb83433d9f33ca4f3837e494 /drivers/net/wireless/realtek
parentrtlwifi: rtl8723ae: Make rtl8723e_dm_refresh_rate_adaptive_mask static (diff)
downloadlinux-b5250c9c14c139f467a935a4b7edfcf202772c52.tar.xz
linux-b5250c9c14c139f467a935a4b7edfcf202772c52.zip
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 <Larry.Finger@lwfinger.net> Reported-by: Andrew Morton <akpm@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/realtek')
-rw-r--r--drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej10
1 files changed, 0 insertions, 10 deletions
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)