summaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-05 11:54:27 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-05 11:54:27 +0200
commit38f0ad7c90c2b2091e7d8689dde294fef27db68b (patch)
tree17742c032f74a953054a99ebc04ee6cd7ead2d9d /net/mac80211/util.c
parent8f0b3b7e222383a21f7d58bd97d5552b3a5dbced (diff)
parent70a9f8797ce298544cfd07328ff59f00488bc491 (diff)
downloadop-kernel-dev-38f0ad7c90c2b2091e7d8689dde294fef27db68b.zip
op-kernel-dev-38f0ad7c90c2b2091e7d8689dde294fef27db68b.tar.gz
Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11 A few small fixes, all driver specific. The removal of the GPIO based pinmuxing is a bug fix, since the obsolete nodes had been removed from the DT it stopped the driver loading.
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 27e0715..72e6292 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;
OpenPOWER on IntegriCloud