Commit 75d31cf1 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville

orinoco: Fix compile warnings

Use min_t to avoid warnings when the typesafe version is used.

Explicitly cast u64s to unsigned long long when being passed to printk.
Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e16ce63c
...@@ -4777,14 +4777,14 @@ static int orinoco_ioctl_get_encodeext(struct net_device *dev, ...@@ -4777,14 +4777,14 @@ static int orinoco_ioctl_get_encodeext(struct net_device *dev,
encoding->flags |= IW_ENCODE_DISABLED; encoding->flags |= IW_ENCODE_DISABLED;
break; break;
case IW_ENCODE_ALG_WEP: case IW_ENCODE_ALG_WEP:
ext->key_len = min(le16_to_cpu(priv->keys[idx].len), ext->key_len = min_t(u16, le16_to_cpu(priv->keys[idx].len),
(u16) max_key_len); max_key_len);
memcpy(ext->key, priv->keys[idx].data, ext->key_len); memcpy(ext->key, priv->keys[idx].data, ext->key_len);
encoding->flags |= IW_ENCODE_ENABLED; encoding->flags |= IW_ENCODE_ENABLED;
break; break;
case IW_ENCODE_ALG_TKIP: case IW_ENCODE_ALG_TKIP:
ext->key_len = min((u16) sizeof(struct orinoco_tkip_key), ext->key_len = min_t(u16, sizeof(struct orinoco_tkip_key),
(u16) max_key_len); max_key_len);
memcpy(ext->key, &priv->tkip_key[idx], ext->key_len); memcpy(ext->key, &priv->tkip_key[idx], ext->key_len);
encoding->flags |= IW_ENCODE_ENABLED; encoding->flags |= IW_ENCODE_ENABLED;
break; break;
...@@ -5686,9 +5686,9 @@ static inline char *orinoco_translate_ext_scan(struct net_device *dev, ...@@ -5686,9 +5686,9 @@ static inline char *orinoco_translate_ext_scan(struct net_device *dev,
/* Timestamp */ /* Timestamp */
iwe.cmd = IWEVCUSTOM; iwe.cmd = IWEVCUSTOM;
iwe.u.data.length = snprintf(custom, MAX_CUSTOM_LEN, iwe.u.data.length =
"tsf=%016llx", snprintf(custom, MAX_CUSTOM_LEN, "tsf=%016llx",
le64_to_cpu(bss->timestamp)); (unsigned long long) le64_to_cpu(bss->timestamp));
if (iwe.u.data.length) if (iwe.u.data.length)
current_ev = iwe_stream_add_point(info, current_ev, end_buf, current_ev = iwe_stream_add_point(info, current_ev, end_buf,
&iwe, custom); &iwe, custom);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment