From: stsp <stsp@openbsd.org>
Date: Mon, 18 Jul 2016 13:10:35 +0000 (+0000)
Subject: Explicitly set iwm(4) firmware Tx aggregation limit to one (which disables
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=17146ccc19006023af629a435248a29f3aaa9fbe;p=openbsd

Explicitly set iwm(4) firmware Tx aggregation limit to one (which disables
Tx aggregation), instead of the maximum (63 frames). Tx aggregation should
already be disabled, so this change should be a no-op. It just avoids any
side effects in case the firmware happens to interpret the limit we set here.
ok mpi@
---

diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 96cd14948ea..09cc9a6f98a 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.94 2016/07/18 13:09:58 stsp Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.95 2016/07/18 13:10:35 stsp Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -6155,7 +6155,11 @@ iwm_setrates(struct iwm_node *in)
 
 	lq->agg_time_limit = htole16(4000);	/* 4ms */
 	lq->agg_disable_start_th = 3;
+#ifdef notyet
 	lq->agg_frame_cnt_limit = 0x3f;
+#else
+	lq->agg_frame_cnt_limit = 1; /* tx agg disabled */
+#endif
 
 	cmd.data[0] = &in->in_lq;
 	if (iwm_send_cmd(sc, &cmd) != 0) {