From: Ana Rey Date: Mon, 17 Mar 2014 20:22:29 +0000 (+0100) Subject: staging: rtl8187se: Use min_t instead of min X-Git-Tag: v3.15-rc1~139^2~160 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d28c88db3c665dd2844238a3416ba11df225b1e9;p=karo-tx-linux.git staging: rtl8187se: Use min_t instead of min Use min_t instead of min function in ieee80211/ieee80211_wx.c Fix sparse warnings: WARNING: min() should probably be min_t(u8, network->ssid_len, 32) Signed-off-by: Ana Rey Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c index 0ac82d328d26..07c3f715a6f5 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c @@ -66,7 +66,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, iwe.u.data.length = sizeof(""); start = iwe_stream_add_point(info, start, stop, &iwe, ""); } else { - iwe.u.data.length = min(network->ssid_len, (u8)32); + iwe.u.data.length = min_t(u8, network->ssid_len, 32); start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid); } /* Add the protocol name */