diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-23 17:50:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-23 17:50:05 +0200 |
| commit | 419fc888e5396968620bb8f85beb7ab55293f04f (patch) | |
| tree | c44c932e7c2e04b831302b8cacae9b7679ec8161 /drivers/net | |
| parent | pcnet32: add an error handling path in pcnet32_probe_pci() (diff) | |
| parent | mac80211_hwsim: Fix radio dump for radio idx 0 (diff) | |
| download | linux-419fc888e5396968620bb8f85beb7ab55293f04f.tar.xz linux-419fc888e5396968620bb8f85beb7ab55293f04f.zip | |
Merge tag 'mac80211-for-davem-2018-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A handful of fixes:
* hwsim radio dump wasn't working for the first radio
* mesh was updating statistics incorrectly
* a netlink message allocation was possibly too short
* wiphy name limit was still too long
* in certain cases regdb query could find a NULL pointer
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 4a017a0d71ea..920c23e542a5 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -3340,7 +3340,7 @@ out_err: static int hwsim_dump_radio_nl(struct sk_buff *skb, struct netlink_callback *cb) { - int last_idx = cb->args[0]; + int last_idx = cb->args[0] - 1; struct mac80211_hwsim_data *data = NULL; int res = 0; void *hdr; @@ -3368,7 +3368,7 @@ static int hwsim_dump_radio_nl(struct sk_buff *skb, last_idx = data->idx; } - cb->args[0] = last_idx; + cb->args[0] = last_idx + 1; /* list changed, but no new element sent, set interrupted flag */ if (skb->len == 0 && cb->prev_seq && cb->seq != cb->prev_seq) { |