diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-06-30 21:08:12 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-30 21:08:12 +0900 |
| commit | 8365da2c0570f02615e7f1d2d729d854029202b0 (patch) | |
| tree | 223ab9641411c401269e5da80f260cafaf40eedc /drivers/staging/rtl8723bs | |
| parent | tipc: extend sock diag for group communication (diff) | |
| parent | mac80211: use BIT_ULL for NL80211_STA_INFO_* attribute types (diff) | |
| download | linux-dev-8365da2c0570f02615e7f1d2d729d854029202b0.tar.xz linux-dev-8365da2c0570f02615e7f1d2d729d854029202b0.zip | |
Merge tag 'mac80211-next-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Small merge conflict in net/mac80211/scan.c, I preserved
the kcalloc() conversion. -DaveM
Johannes Berg says:
====================
This round's updates:
* finally some of the promised HE code, but it turns
out to be small - but everything kept changing, so
one part I did in the driver was >30 patches for
what was ultimately <200 lines of code ... similar
here for this code.
* improved scan privacy support - can now specify scan
flags for randomizing the sequence number as well as
reducing the probe request element content
* rfkill cleanups
* a timekeeping cleanup from Arnd
* various other cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/rtl8723bs')
| -rw-r--r-- | drivers/staging/rtl8723bs/include/wifi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index 08bc79840b23..559bf2606fb7 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -799,7 +799,6 @@ enum HT_CAP_AMPDU_FACTOR { * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) */ #define IEEE80211_MIN_AMPDU_BUF 0x8 -#define IEEE80211_MAX_AMPDU_BUF 0x40 /* Spatial Multiplexing Power Save Modes */ |