diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-06-19 18:55:06 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-19 18:55:12 +0200 |
| commit | f93beba705842af466e7c916b39630cacb40e9c6 (patch) | |
| tree | 0f296f0b1e419eb4fc242e188376a4fdd80085fa /net/mac80211/ieee80211_i.h | |
| parent | 52874a5e3917dde3b081521b014d6e4b226aacff (diff) | |
| parent | 3a5a423bb958ad22eeccca66c533e85bf69ba10e (diff) | |
| download | op-kernel-dev-f93beba705842af466e7c916b39630cacb40e9c6.zip op-kernel-dev-f93beba705842af466e7c916b39630cacb40e9c6.tar.gz | |
Merge remote-tracking branch 'mac80211/master' into HEAD
Merge mac80211 to avoid conflicts with the nl80211 attrbuf
changes.
Conflicts:
net/mac80211/iface.c
net/wireless/nl80211.c
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 00d71e9..8412a30 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1513,10 +1513,11 @@ static inline void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, ieee80211_tx_skb_tid(sdata, skb, 7); } -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); -static inline void ieee802_11_parse_elems(u8 *start, size_t len, bool action, +static inline void ieee802_11_parse_elems(const u8 *start, size_t len, + bool action, struct ieee802_11_elems *elems) { ieee802_11_parse_elems_crc(start, len, action, elems, 0, 0); |
