diff options
author | David S. Miller | 2018-05-27 01:46:15 +0200 |
---|---|---|
committer | David S. Miller | 2018-05-27 01:46:15 +0200 |
commit | 5b79c2af667c0e2684f2a6dbf6439074b78f490c (patch) | |
tree | efda2b94317c914fef0bfb25fe5ada9e253d5415 /drivers/net/wireless/mac80211_hwsim.c | |
parent | net: dsa: dsa_loop: Make dynamic debugging helpful (diff) | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
download | kernel-qcow2-linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.tar.gz kernel-qcow2-linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.tar.xz kernel-qcow2-linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
-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 c26469b54ac9..89fc22520d40 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -3341,7 +3341,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; @@ -3369,7 +3369,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) { |