The removed patches were applied upstream. The type of the RT2X00_LIB_EEPROM config option was changed to bool, because boolean is an invalid value and the new kconfig system complained about this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			12 lines
		
	
	
		
			385 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			12 lines
		
	
	
		
			385 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
--- a/net/mac80211/cfg.c
 | 
						|
+++ b/net/mac80211/cfg.c
 | 
						|
@@ -2319,7 +2319,7 @@ static int ieee80211_scan(struct wiphy *
 | 
						|
 		 * the  frames sent while scanning on other channel will be
 | 
						|
 		 * lost)
 | 
						|
 		 */
 | 
						|
-		if (sdata->u.ap.beacon &&
 | 
						|
+		if (0 && sdata->u.ap.beacon &&
 | 
						|
 		    (!(wiphy->features & NL80211_FEATURE_AP_SCAN) ||
 | 
						|
 		     !(req->flags & NL80211_SCAN_FLAG_AP)))
 | 
						|
 			return -EOPNOTSUPP;
 |