Commit 33ccad35 authored by Jiri Benc's avatar Jiri Benc Committed by John W. Linville

[PATCH] mac80211: fix GCC warning on 64bit platforms

net/mac80211/ieee80211.c: In function ieee80211_register_hw:
net/mac80211/ieee80211.c:4989: warning: comparison of distinct pointer types lacks a cast

Size of ieee80211_tx_status_rtap_hdr structure will never be greater than
unsigned int.
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8b8857a3
...@@ -4986,7 +4986,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ...@@ -4986,7 +4986,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
* and we need some headroom for passing the frame to monitor * and we need some headroom for passing the frame to monitor
* interfaces, but never both at the same time. * interfaces, but never both at the same time.
*/ */
local->tx_headroom = max(local->hw.extra_tx_headroom, local->tx_headroom = max_t(unsigned int , local->hw.extra_tx_headroom,
sizeof(struct ieee80211_tx_status_rtap_hdr)); sizeof(struct ieee80211_tx_status_rtap_hdr));
debugfs_hw_add(local); debugfs_hw_add(local);
......
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