aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/ipw2100.c
diff options
context:
space:
mode:
authorSilvan Jegen <s.jegen@gmail.com>2014-02-25 12:12:52 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-03-03 15:35:54 -0500
commitc8e4955653a470ece7bf580c84fc88eb58cc9850 (patch)
tree0517b79659c4b4b0d83528dfc973d99c4de19770 /drivers/net/wireless/ipw2x00/ipw2100.c
parent9ffd2e9a174769913dcce0fbc9223b58d2eb5526 (diff)
net: Replace min macro with min_t
Instead of an explicit cast, use the min_t macro. Signed-off-by: Silvan Jegen <s.jegen@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 3aba49259ef1..dfc6dfc56d52 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -7065,7 +7065,7 @@ static int ipw2100_wx_set_nick(struct net_device *dev,
7065 if (wrqu->data.length > IW_ESSID_MAX_SIZE) 7065 if (wrqu->data.length > IW_ESSID_MAX_SIZE)
7066 return -E2BIG; 7066 return -E2BIG;
7067 7067
7068 wrqu->data.length = min((size_t) wrqu->data.length, sizeof(priv->nick)); 7068 wrqu->data.length = min_t(size_t, wrqu->data.length, sizeof(priv->nick));
7069 memset(priv->nick, 0, sizeof(priv->nick)); 7069 memset(priv->nick, 0, sizeof(priv->nick));
7070 memcpy(priv->nick, extra, wrqu->data.length); 7070 memcpy(priv->nick, extra, wrqu->data.length);
7071 7071