aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Muehlenhoff <jmm@debian.org>2009-01-25 21:54:58 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:17 -0700
commit090504701605d627b4a8ddb0d584f00613ee41fe (patch)
treeb4674042e3b92e940b014c5ee7b46cc4688fee0b
parent350f2f4bd6570f6f1996516ddd135ab2a95484de (diff)
Staging: wlan-ng: Remove wlan_max()/wlan_min()
Replace wlan_min() with the generic min_t(), remove unused wlan_max(). Signed-off-by: Moritz Muehlenhoff <jmm@debian.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/wlan-ng/p80211wext.c2
-rw-r--r--drivers/staging/wlan-ng/wlan_compat.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 76b7707f670..4834ad07c24 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/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/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
index a8abc42b95e..42d8d0c95b6 100644
--- a/drivers/staging/wlan-ng/wlan_compat.h
+++ b/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)))