diff options
| author |   stsp <stsp@openbsd.org> | 2016-12-10 13:22:07 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2016-12-10 13:22:07 +0000 |
| commit | 02e127aa9d047cc62dcc22f65eb5fe39fbeec38c (patch) | |
| tree | 8be5ae0451cc61263de59d9fa69c29de9ceaa6dd | |
| parent | Document SSL_version(3). It's listed in ssl(3) and <openssl/ssl.h>, (diff) | |
| download | wireguard-openbsd-02e127aa9d047cc62dcc22f65eb5fe39fbeec38c.tar.xz wireguard-openbsd-02e127aa9d047cc62dcc22f65eb5fe39fbeec38c.zip | |
Make retry-heavy rates less attractive to mira.
The number of retried frames shrinks significantly.
ok tb@
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index baac7627b4e..a3bc72ac3ee 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.151 2016/12/08 17:24:25 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.152 2016/12/10 13:22:07 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -3386,10 +3386,10 @@ iwm_rx_tx_cmd_single(struct iwm_softc *sc, struct iwm_rx_packet *pkt, in->in_mn.frames += tx_resp->frame_count; in->in_mn.ampdu_size = le16toh(tx_resp->byte_cnt); in->in_mn.agglen = tx_resp->frame_count; - if (txfail) { - in->in_mn.retries += tx_resp->failure_frame; + if (tx_resp->failure_frame > 0) + in->in_mn.retries++; + if (txfail) in->in_mn.txfail += tx_resp->frame_count; - } if (ic->ic_state == IEEE80211_S_RUN) ieee80211_mira_choose(&in->in_mn, ic, &in->in_ni); /* diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 685eebbb524..be7825b8591 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.177 2016/12/07 15:48:44 stsp Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.178 2016/12/10 13:22:07 stsp Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2378,10 +2378,10 @@ iwn_tx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, uint8_t nframes, wn->mn.frames += nframes; wn->mn.ampdu_size = len; wn->mn.agglen = nframes; - if (txfail) { - wn->mn.retries += ackfailcnt; + if (ackfailcnt > 0) + wn->mn.retries++; + if (txfail) wn->mn.txfail += nframes; - } if (ic->ic_state == IEEE80211_S_RUN) ieee80211_mira_choose(&wn->mn, ic, data->ni); } else { |