summaryrefslogtreecommitdiff
path: root/drivers/staging/wlan-ng/p80211wext.c
diff options
context:
space:
mode:
authorMoritz Muehlenhoff <jmm@debian.org>2009-01-25 20:54:58 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 21:53:17 (GMT)
commit090504701605d627b4a8ddb0d584f00613ee41fe (patch)
treeb4674042e3b92e940b014c5ee7b46cc4688fee0b /drivers/staging/wlan-ng/p80211wext.c
parent350f2f4bd6570f6f1996516ddd135ab2a95484de (diff)
downloadlinux-fsl-qoriq-090504701605d627b4a8ddb0d584f00613ee41fe.tar.xz
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>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211wext.c')
-rw-r--r--drivers/staging/wlan-ng/p80211wext.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 76b7707..4834ad0 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);