Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync openbsd net80211 #453

Merged
merged 13 commits into from
Dec 17, 2020
Merged

Sync openbsd net80211 #453

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d68cdba
Sync changes from openbsd
pigworlds Dec 12, 2020
0ad7c7b
Kill unused IEEE80211_RADIOTAP_HWQUEUE.
pigworlds Dec 12, 2020
97972cc
The command value of the _IOC() macro is limited to values [0..255].
pigworlds Dec 12, 2020
68ebb58
Add missing #if's to fix build without bpf(4).
pigworlds Dec 12, 2020
fdc267e
The IEEE80211_F_HIDENWID flag is now part of ic_userflags, not ic_flags.
pigworlds Dec 12, 2020
b945fbb
Improve processing of lost frames during 802.11 Rx aggregation.
pigworlds Dec 12, 2020
cf2e837
Use BA agreement immediately after it is requested by the AP.
pigworlds Dec 12, 2020
3012af3
Fix gapwait accounting.
pigworlds Dec 12, 2020
e848940
Fix 802.11 RSN capabilities announced to peers.
pigworlds Dec 12, 2020
a9fba6e
Flush reorder buffer after gap timeout, otherwise the frames remain i…
pigworlds Dec 12, 2020
9a59277
Disable A-MSDU support again.
pigworlds Dec 12, 2020
3409b6f
Ignore trailing data in A-MSDU frame buffers if it is smaller than th…
pigworlds Dec 12, 2020
21ccac9
Fix double-free on error in ieee80211_amsdu_decap().
pigworlds Dec 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix double-free on error in ieee80211_amsdu_decap().
  • Loading branch information
@pigworlds
pigworlds committed Dec 12, 2020
commit 21ccac998dcff3f2f054dc0ae11304a4dabe6f2a
8 changes: 4 additions & 4 deletions itl80211/openbsd/net80211/ieee80211_input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ ieee80211_amsdu_decap(struct ieee80211com *ic, mbuf_t m,
mbuf_pullup(&m, ETHER_HDR_LEN + LLC_SNAPFRAMELEN);
if (m == NULL) {
ic->ic_stats.is_rx_decap++;
break;
return;
}
eh = mtod(m, struct ether_header *);
/* examine 802.3 header */
Expand All @@ -1185,7 +1185,7 @@ ieee80211_amsdu_decap(struct ieee80211com *ic, mbuf_t m,
/* stop processing A-MSDU subframes */
ic->ic_stats.is_rx_decap++;
mbuf_freem(m);
break;
return;
}
llc = (struct llc *)&eh[1];
/* examine 802.2 LLC header */
Expand All @@ -1209,7 +1209,7 @@ ieee80211_amsdu_decap(struct ieee80211com *ic, mbuf_t m,
DPRINTF(("A-MSDU subframe too long (%d)\n", len));
ic->ic_stats.is_rx_decap++;
mbuf_freem(m);
break;
return;
}

/* "detach" our A-MSDU subframe from the others */
Expand All @@ -1218,7 +1218,7 @@ ieee80211_amsdu_decap(struct ieee80211com *ic, mbuf_t m,
/* stop processing A-MSDU subframes */
ic->ic_stats.is_rx_decap++;
mbuf_freem(m);
break;
return;
}
ieee80211_enqueue_data(ic, m, ni, mcast, ml);

Expand Down