svn commit: r277151 - head/sys/dev/ixl

[Jack F Vogel]

Author: jfv
Date: Tue Jan 13 22:13:30 2015
New Revision: 277151
URL: https://svnweb.freebsd.org/changeset/base/277151

Log:
  Cleanup some bogus code in the RSS config, and add the include
  for the rss option file. And bump the version.
  
  MFC after:	1 week

Modified:
  head/sys/dev/ixl/if_ixl.c
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/if_ixl.c
==============================================================================
--- head/sys/dev/ixl/if_ixl.c	Tue Jan 13 22:13:03 2015	(r277150)
+++ head/sys/dev/ixl/if_ixl.c	Tue Jan 13 22:13:30 2015	(r277151)
@@ -41,7 +41,7 @@
 /*********************************************************************
  *  Driver version
  *********************************************************************/
-char ixl_driver_version[] = "1.3.0";
+char ixl_driver_version[] = "1.3.1";
 
 /*********************************************************************
  *  PCI Device ID Table
@@ -3212,12 +3212,12 @@ static void ixl_config_rss(struct ixl_vs
                 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP);
 	if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6)
                 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_OTHER);
+        if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6_EX)
+		set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6);
 	if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6)
                 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
         if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
                 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP);
-        if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX)
-                set_hena |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;
 #else
 	set_hena =
 		((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |

Modified: head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- head/sys/dev/ixl/ixl_txrx.c	Tue Jan 13 22:13:03 2015	(r277150)
+++ head/sys/dev/ixl/ixl_txrx.c	Tue Jan 13 22:13:30 2015	(r277151)
@@ -40,6 +40,7 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_rss.h"
 #include "ixl.h"
 
 /* Local Prototypes */