22 lines
		
	
	
		
			625 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			22 lines
		
	
	
		
			625 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
From: Felix Fietkau <nbd@nbd.name>
 | 
						|
Date: Fri, 23 Feb 2018 09:59:35 +0100
 | 
						|
Subject: [PATCH] mac80211: drop frames with unexpected DS bits from
 | 
						|
 fast-rx to slow path
 | 
						|
 | 
						|
Fixes rx for 4-addr packets in AP mode
 | 
						|
 | 
						|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
						|
---
 | 
						|
 | 
						|
--- a/net/mac80211/rx.c
 | 
						|
+++ b/net/mac80211/rx.c
 | 
						|
@@ -3928,7 +3928,7 @@ static bool ieee80211_invoke_fast_rx(str
 | 
						|
 	if ((hdr->frame_control & cpu_to_le16(IEEE80211_FCTL_FROMDS |
 | 
						|
 					      IEEE80211_FCTL_TODS)) !=
 | 
						|
 	    fast_rx->expected_ds_bits)
 | 
						|
-		goto drop;
 | 
						|
+		return false;
 | 
						|
 
 | 
						|
 	/* assign the key to drop unencrypted frames (later)
 | 
						|
 	 * and strip the IV/MIC if necessary
 |