summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-12 08:09:04 +0300
committerDavid S. Miller <davem@davemloft.net>2011-02-12 08:09:04 +0300
commit58bb4bd0e0b1ab560a7320a760141ba52db68791 (patch)
tree47ca0cfe15778e851c7515e5eac1f9df0593c90c /include/linux
parentdd68153def6b890a23288776cbd5bd2bad223a3f (diff)
parent1b1c0a489c1dcc1fa640c13404ca69e7beae07d9 (diff)
downloadlinux-58bb4bd0e0b1ab560a7320a760141ba52db68791.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dcbnl.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index 68cd248f6d3e..cd8d518efa3b 100644
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -25,6 +25,11 @@
/* IEEE 802.1Qaz std supported values */
#define IEEE_8021QAZ_MAX_TCS 8
+#define IEEE_8021QAZ_TSA_STRICT 0
+#define IEEE_8021QAZ_TSA_CB_SHABER 1
+#define IEEE_8021QAZ_TSA_ETS 2
+#define IEEE_8021QAZ_TSA_VENDOR 255
+
/* This structure contains the IEEE 802.1Qaz ETS managed object
*
* @willing: willing bit in ETS configuratin TLV