---

yaml --- r: 141166 b: refs/heads/master c: 0905047 h: refs/heads/master v: v3
git-mirror · Apr 3, 2009 · 788efb0 · 788efb0
1 parent 3c22377
commit 788efb0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 350f2f4bd6570f6f1996516ddd135ab2a95484de
+refs/heads/master: 090504701605d627b4a8ddb0d584f00613ee41fe
diff --git a/trunk/drivers/staging/wlan-ng/p80211wext.c b/trunk/drivers/staging/wlan-ng/p80211wext.c
@@ -1328,7 +1328,7 @@ wext_translate_bss(struct iw_request_info *info, char *current_ev,
 		char essid[IW_ESSID_MAX_SIZE + 1];
 		int size;
 
-		size = wlan_min(IW_ESSID_MAX_SIZE, bss->ssid.data.len);
+		size = min_t(unsigned short, IW_ESSID_MAX_SIZE, bss->ssid.data.len);
 		memset(&essid, 0, sizeof (essid));
 		memcpy(&essid, bss->ssid.data.data, size);
 		WLAN_LOG_DEBUG(1, " essid size = %d\n", size);

diff --git a/trunk/drivers/staging/wlan-ng/wlan_compat.h b/trunk/drivers/staging/wlan-ng/wlan_compat.h
@@ -86,9 +86,6 @@ typedef struct net_device netdevice_t;
 /*--- General Macros ------------------------------------------*/
 /*=============================================================*/
 
-#define wlan_max(a, b) (((a) > (b)) ? (a) : (b))
-#define wlan_min(a, b) (((a) < (b)) ? (a) : (b))
-
 #define wlan_isprint(c)	(((c) > (0x19)) && ((c) < (0x7f)))
 
 #define wlan_hexchar(x) (((x) < 0x0a) ? ('0' + (x)) : ('a' + ((x) - 0x0a)))