diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-18 18:04:51 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-18 18:04:51 (GMT) |
commit | 9d1059c2481885ba7a2af02fc1bf87cae88b302a (patch) | |
tree | b9ff1d502017ea7939d26a99720801ffdbe2b3da /net/mac80211/util.c | |
parent | c4d827c5ccc3a49227dbf9d4b248a2e86f388023 (diff) | |
parent | fcb3701849957917a234a61b58ad70ed35c83eda (diff) | |
download | linux-9d1059c2481885ba7a2af02fc1bf87cae88b302a.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 5a6c135..2265445 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -667,12 +667,12 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw, } EXPORT_SYMBOL(ieee80211_queue_delayed_work); -u32 ieee802_11_parse_elems_crc(u8 *start, size_t len, bool action, +u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, struct ieee802_11_elems *elems, u64 filter, u32 crc) { size_t left = len; - u8 *pos = start; + const u8 *pos = start; bool calc_crc = filter != 0; DECLARE_BITMAP(seen_elems, 256); const u8 *ie; |