svn commit: r195818 - in head: share/man/man4 sys/dev/mxge

[Andrew Gallatin]

Author: gallatin
Date: Wed Jul 22 11:57:34 2009
New Revision: 195818
URL: http://svn.freebsd.org/changeset/base/195818

Log:
  mxge's tunable hw.mxge.rss_hash_type cannot be set from the
  loader, because it uses a reserved suffix (_type).  Fix
  this by removing the "_" and renaming the tunable to
  hw.mxge.rss_hashtype.  The old (rss_hash_type) tunable is
  still fetched, in case people load the driver via scripts.
  When both are present in the kernel environment,
  the new value (hw.mxge.rss_hashtype) overrides the old
  value.
  
  Approved by:	re (kib)

Modified:
  head/share/man/man4/mxge.4
  head/sys/dev/mxge/if_mxge.c

Modified: head/share/man/man4/mxge.4
==============================================================================
--- head/share/man/man4/mxge.4	Wed Jul 22 03:50:54 2009	(r195817)
+++ head/share/man/man4/mxge.4	Wed Jul 22 11:57:34 2009	(r195818)
@@ -125,14 +125,14 @@ A slice is comprised
 of a set of receive queues and an associated interrupt thread.
 When using multiple slices, the NIC hashes traffic to different slices
 based on the value of
-.Va hw.mxge.rss_hash_type .
+.Va hw.mxge.rss_hashtype .
 Using multiple slices requires that your motherboard and Myri10GE NIC
 both be capable of MSI-X.
 Older Myri10GE NICs can be field upgraded to add
 MSI-X using the "10G NIC Tool Kit" for FreeBSD which is available from
 .Pa http://www.myri.com/scs/download-10g-tools.html .
 .Pp
-.It Va hw.mxge.rss_hash_type
+.It Va hw.mxge.rss_hashtype
 This value determines how incoming traffic is steered to different
 slices.
 This tunable is ignored when using just a single slice.

Modified: head/sys/dev/mxge/if_mxge.c
==============================================================================
--- head/sys/dev/mxge/if_mxge.c	Wed Jul 22 03:50:54 2009	(r195817)
+++ head/sys/dev/mxge/if_mxge.c	Wed Jul 22 11:57:34 2009	(r195818)
@@ -4014,6 +4014,7 @@ mxge_fetch_tunables(mxge_softc_t *sc)
 	TUNABLE_INT_FETCH("hw.mxge.lro_cnt", &sc->lro_cnt);
 	TUNABLE_INT_FETCH("hw.mxge.always_promisc", &mxge_always_promisc);
 	TUNABLE_INT_FETCH("hw.mxge.rss_hash_type", &mxge_rss_hash_type);
+	TUNABLE_INT_FETCH("hw.mxge.rss_hashtype", &mxge_rss_hash_type);
 	TUNABLE_INT_FETCH("hw.mxge.initial_mtu", &mxge_initial_mtu);
 	if (sc->lro_cnt != 0)
 		mxge_lro_cnt = sc->lro_cnt;