diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-19 13:03:51 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-19 13:04:16 +0300 |
| commit | d5a17cfb9875a873474985f630b5061a4f2142b2 (patch) | |
| tree | 14e6a9c9064c3a190ff25aa3af61316646acc36d /net/mac80211/ieee80211_i.h | |
| parent | 707a13c7e488785170a5e7f2467f2823824651e2 (diff) | |
| parent | f1a0898b5d6a77d332d036da03bad6fa9770de5b (diff) | |
| download | linux-d5a17cfb9875a873474985f630b5061a4f2142b2.tar.xz | |
Merge wireless into wireless-next
There are some locking changes that will later otherwise
cause conflicts, so merge wireless into wireless-next to
avoid those.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index f55cec0e6b2d..7a98fa26ec92 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -2315,7 +2315,7 @@ ieee802_11_parse_elems(const u8 *start, size_t len, bool action, return ieee802_11_parse_elems_crc(start, len, action, 0, 0, bss); } -void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos); +void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos, u8 frag_id); extern const int ieee802_1d_to_ac[8]; |