From fbdfba74b954abdbaafc2e65a15da2940ac01787 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Mon, 10 Dec 2012 23:21:22 +0000 Subject: [PATCH] --- yaml --- r: 353975 b: refs/heads/master c: 0024a1e73404b06a302f39eb3ceb15d9d741c552 h: refs/heads/master i: 353973: dbf33520b006993e7ce5b684265fa66ed0dd3061 353971: b4b920f846e667353d23c90552b6aa68c47915c4 353967: ddc6a3862f44f36e5d81d3c426898f94974ffc58 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 47c0d2eee924..9054b96f8222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87a573ada017b40facab87b149fcbb3344eab9e8 +refs/heads/master: 0024a1e73404b06a302f39eb3ceb15d9d741c552 diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 43de44ac21ca..f034567122d9 100644 --- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -188,8 +188,7 @@ static inline char *translate_scan(struct _adapter *padapter, /* Add the ESSID */ iwe.cmd = SIOCGIWESSID; iwe.u.data.flags = 1; - iwe.u.data.length = (u16)min((u16)pnetwork->network.Ssid.SsidLength, - (u16)32); + iwe.u.data.length = min_t(u32, pnetwork->network.Ssid.SsidLength, 32); start = iwe_stream_add_point(info, start, stop, &iwe, pnetwork->network.Ssid.Ssid); /* parsing HT_CAP_IE */ @@ -1194,8 +1193,7 @@ static int r8711_wx_set_scan(struct net_device *dev, if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { struct ndis_802_11_ssid ssid; unsigned long irqL; - u32 len = (u32) min((u8)req->essid_len, - (u8)IW_ESSID_MAX_SIZE); + u32 len = min_t(u8, req->essid_len, IW_ESSID_MAX_SIZE); memset((unsigned char *)&ssid, 0, sizeof(struct ndis_802_11_ssid)); memcpy(ssid.Ssid, req->essid, len);