aboutsummaryrefslogtreecommitdiffstats
path: root/sys/dev/ixl/ixl.h
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.h
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.h')
-rw-r--r--sys/dev/ixl/ixl.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h
index 39d9137b7b0d..30e195f2980e 100644
--- a/sys/dev/ixl/ixl.h
+++ b/sys/dev/ixl/ixl.h
@@ -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
@@ -208,7 +208,9 @@
#define IXL_TX_BUF_SZ ((u32) 1514)
#define IXL_AQ_BUF_SZ ((u32) 4096)
#define IXL_RX_HDR 128
+/* Controls the length of the Admin Queue */
#define IXL_AQ_LEN 256
+#define IXL_AQ_LEN_MAX 1024
#define IXL_AQ_BUFSZ 4096
#define IXL_RX_LIMIT 512
#define IXL_RX_ITR 0
@@ -273,7 +275,7 @@
#define IXL_RX_UNLOCK(_sc) mtx_unlock(&(_sc)->mtx)
#define IXL_RX_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->mtx)
-#if __FreeBSD_version >= 1100000
+#if __FreeBSD_version >= 1100036
#define IXL_SET_IPACKETS(vsi, count) (vsi)->ipackets = (count)
#define IXL_SET_IERRORS(vsi, count) (vsi)->ierrors = (count)
#define IXL_SET_OPACKETS(vsi, count) (vsi)->opackets = (count)
@@ -469,7 +471,6 @@ struct ixl_vsi {
u16 max_frame_size;
u32 link_speed;
bool link_up;
- u32 fc; /* local flow ctrl setting */
/* MAC/VLAN Filter list */
struct ixl_ftl_head ftl;