diff options
author | Silvan Jegen <s.jegen@gmail.com> | 2014-02-25 12:12:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-03 15:35:54 -0500 |
commit | c8e4955653a470ece7bf580c84fc88eb58cc9850 (patch) | |
tree | 0517b79659c4b4b0d83528dfc973d99c4de19770 /drivers/net/wireless/b43legacy/main.c | |
parent | 9ffd2e9a174769913dcce0fbc9223b58d2eb5526 (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/b43legacy/main.c')
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 349c77605231..1aec2146a2bf 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -978,7 +978,7 @@ static void b43legacy_write_beacon_template(struct b43legacy_wldev *dev, | |||
978 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(dev->wl->current_beacon); | 978 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(dev->wl->current_beacon); |
979 | 979 | ||
980 | bcn = (const struct ieee80211_mgmt *)(dev->wl->current_beacon->data); | 980 | bcn = (const struct ieee80211_mgmt *)(dev->wl->current_beacon->data); |
981 | len = min((size_t)dev->wl->current_beacon->len, | 981 | len = min_t(size_t, dev->wl->current_beacon->len, |
982 | 0x200 - sizeof(struct b43legacy_plcp_hdr6)); | 982 | 0x200 - sizeof(struct b43legacy_plcp_hdr6)); |
983 | rate = ieee80211_get_tx_rate(dev->wl->hw, info)->hw_value; | 983 | rate = ieee80211_get_tx_rate(dev->wl->hw, info)->hw_value; |
984 | 984 | ||
@@ -1155,7 +1155,7 @@ static void b43legacy_write_probe_resp_template(struct b43legacy_wldev *dev, | |||
1155 | b43legacy_write_probe_resp_plcp(dev, 0x350, size, | 1155 | b43legacy_write_probe_resp_plcp(dev, 0x350, size, |
1156 | &b43legacy_b_ratetable[3]); | 1156 | &b43legacy_b_ratetable[3]); |
1157 | 1157 | ||
1158 | size = min((size_t)size, | 1158 | size = min_t(size_t, size, |
1159 | 0x200 - sizeof(struct b43legacy_plcp_hdr6)); | 1159 | 0x200 - sizeof(struct b43legacy_plcp_hdr6)); |
1160 | b43legacy_write_template_common(dev, probe_resp_data, | 1160 | b43legacy_write_template_common(dev, probe_resp_data, |
1161 | size, ram_offset, | 1161 | size, ram_offset, |