]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rtlwifi: rtl8188ee: Remove extraneous file
authorLarry Finger <Larry.Finger@lwfinger.net>
Wed, 17 Apr 2019 00:35:47 +0000 (19:35 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 18 Apr 2019 13:08:23 +0000 (16:08 +0300)
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>
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej [deleted 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 (file)
index aa03d46..0000000
+++ /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)