diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-17 13:44:01 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-17 13:44:01 -0400 |
| commit | 722a300bf84ebebe21da164e75024c0ce7ca1868 (patch) | |
| tree | 8cb886d70ce00fe0741bb1a61ba6d86bc2136bb8 /net/mac80211/util.c | |
| parent | 8177a9d79c0e942dcac3312f15585d0344d505a5 (diff) | |
| parent | fcb3701849957917a234a61b58ad70ed35c83eda (diff) | |
| download | talos-obmc-linux-722a300bf84ebebe21da164e75024c0ce7ca1868.tar.gz talos-obmc-linux-722a300bf84ebebe21da164e75024c0ce7ca1868.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 27e07150eb46..72e6292955bb 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -661,12 +661,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; |
