diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-18 20:00:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-18 20:00:27 +0100 |
| commit | 87305c4cd261664a12cff16740d0c40065bbd07f (patch) | |
| tree | 5fa9a470f011736d0ff728aa54f9f540b2485724 /drivers/net | |
| parent | af_unix: conditionally use freezable blocking calls in read (diff) | |
| parent | cfg80211: limit scan results cache size (diff) | |
| download | linux-87305c4cd261664a12cff16740d0c40065bbd07f.tar.xz linux-87305c4cd261664a12cff16740d0c40065bbd07f.zip | |
Merge tag 'mac80211-for-davem-2016-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few more bugfixes:
* limit # of scan results stored in memory - this is a long-standing bug
Jouni and I only noticed while discussing other things in Santa Fe
* revert AP_LINK_PS patch that was causing issues (Felix)
* various A-MSDU/A-MPDU fixes for TXQ code (Felix)
* interoperability workaround for peers with broken VHT capabilities
(Filip Matusiak)
* add bitrate definition for a VHT MCS that's supposed to be invalid
but gets used by some hardware anyway (Thomas Pedersen)
* beacon timer fix in hwsim (Benjamin Beichler)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 431f13b4faf6..d3bad5779376 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -826,7 +826,7 @@ static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw, data->bcn_delta = do_div(delta, bcn_int); } else { data->tsf_offset -= delta; - data->bcn_delta = -do_div(delta, bcn_int); + data->bcn_delta = -(s64)do_div(delta, bcn_int); } } |