Some of the drivers test the wrong bit in an RX descriptor. That is fixed. In a second patch, that variable is moved out of a struct and made local to the routine that uses it. Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> --- V2 - Fixed Merge problem Larry Finger (2): rtlwifi: Fix duplicate tests of one of the RX descriptors rtlwifi: Convert the wake_match variable to local .../wireless/realtek/rtlwifi/rtl8188ee/trx.c | 17 +++++++++-------- .../realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ++++++++++ .../wireless/realtek/rtlwifi/rtl8192ee/trx.c | 15 ++++++++------- .../wireless/realtek/rtlwifi/rtl8723be/trx.c | 16 ++++++++-------- .../wireless/realtek/rtlwifi/rtl8821ae/trx.c | 14 +++++++------- drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - 6 files changed, 42 insertions(+), 31 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej -- 2.21.0