The fix in r39482 was wrong. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39528
		
			
				
	
	
		
			23 lines
		
	
	
		
			641 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			23 lines
		
	
	
		
			641 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
From d17fcac710e629463591f6bd09d76b66ec591583 Mon Sep 17 00:00:00 2001
 | 
						|
From: Hauke Mehrtens <hauke@hauke-m.de>
 | 
						|
Date: Wed, 5 Feb 2014 20:57:07 +0100
 | 
						|
Subject: [PATCH] Fix 3.14 build
 | 
						|
 | 
						|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 | 
						|
---
 | 
						|
 main.c |    2 ++
 | 
						|
 1 file changed, 2 insertions(+)
 | 
						|
 | 
						|
--- a/main.c
 | 
						|
+++ b/main.c
 | 
						|
@@ -500,7 +500,9 @@ int acx_init_ieee80211(acx_device_t *ade
 | 
						|
 	hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
 | 
						|
 	hw->queues = 1;
 | 
						|
 	hw->wiphy->max_scan_ssids = 1;
 | 
						|
+#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 14, 0)
 | 
						|
 	hw->channel_change_time = 10000;
 | 
						|
+#endif
 | 
						|
 
 | 
						|
 	/* OW TODO Check if RTS/CTS threshold can be included here */
 | 
						|
 
 |