diff options
| author | Jiri Benc | 2007-07-18 17:10:44 +0200 |
|---|---|---|
| committer | John W. Linville | 2007-07-19 02:35:42 +0200 |
| commit | 33ccad35a21df51c0d23f3e3e88688524e7b51ed (patch) | |
| tree | c410a10edf3eeeec0088beada2bb4425a09f0241 /net | |
| parent | [PATCH] mac80211: regdomain.c needs to include ieee80211_i.h (diff) | |
| download | kernel-qcow2-linux-33ccad35a21df51c0d23f3e3e88688524e7b51ed.tar.gz kernel-qcow2-linux-33ccad35a21df51c0d23f3e3e88688524e7b51ed.tar.xz kernel-qcow2-linux-33ccad35a21df51c0d23f3e3e88688524e7b51ed.zip | |
[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: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 6c63dcf9f1ec..c944b17d0fc0 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c @@ -4986,8 +4986,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) * and we need some headroom for passing the frame to monitor * interfaces, but never both at the same time. */ - local->tx_headroom = max(local->hw.extra_tx_headroom, - sizeof(struct ieee80211_tx_status_rtap_hdr)); + local->tx_headroom = max_t(unsigned int , local->hw.extra_tx_headroom, + sizeof(struct ieee80211_tx_status_rtap_hdr)); debugfs_hw_add(local); |