aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/ixl/ixl_txrx.c
diff options
context:
space:
mode:
authorJack F Vogel <jfv@FreeBSD.org>2015-02-20 00:40:26 +0000
committerJack F Vogel <jfv@FreeBSD.org>2015-02-20 00:40:26 +0000
commitb6c8f26052c7c23c4552f97a0fbff4da96284c73 (patch)
tree0d2eabe4532288f43bc9fb3736f1d71a23810de1 /sys/dev/ixl/ixl_txrx.c
parent26d50672d61f9021005fad5636db16164ab5cb62 (diff)
downloadsrc-b6c8f26052c7c23c4552f97a0fbff4da96284c73.tar.gz
src-b6c8f26052c7c23c4552f97a0fbff4da96284c73.zip
Bring the XL710 drivers up to the SW3 release level.
MFC after: 1 week
Notes
Notes: svn path=/head/; revision=279033
Diffstat (limited to 'sys/dev/ixl/ixl_txrx.c')
-rwxr-xr-xsys/dev/ixl/ixl_txrx.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c
index 6a6ab7c9ccc1..89b07d1dddf8 100755
--- a/sys/dev/ixl/ixl_txrx.c
+++ b/sys/dev/ixl/ixl_txrx.c
@@ -1,6 +1,6 @@
/******************************************************************************
- Copyright (c) 2013-2014, Intel Corporation
+ Copyright (c) 2013-2015, Intel Corporation
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -38,12 +38,15 @@
** both the BASE and the VF drivers.
*/
+#ifndef IXL_STANDALONE_BUILD
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_rss.h"
+#endif
+
#include "ixl.h"
-#ifdef RSS
+#ifdef RSS
#include <net/rss_config.h>
#endif
@@ -1371,7 +1374,7 @@ ixl_rx_discard(struct rx_ring *rxr, int i)
#ifdef RSS
/*
-** ixl_ptype_to_hash: parse the packet type
+** i40e_ptype_to_hash: parse the packet type
** to determine the appropriate hash.
*/
static inline int