drbd: The kernel code is now equivalent to out of tree release 8.3.7

[safe/jmp/linux-2.6] / include / linux / dcbnl.h

diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index b0ef274..b7cdbb4 100644 (file)
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -20,10 +20,12 @@
 #ifndef __LINUX_DCBNL_H__
 #define __LINUX_DCBNL_H__
 
+#include <linux/types.h>
+
 #define DCB_PROTO_VERSION 1
 
 struct dcbmsg {
-       unsigned char      dcb_family;
+       __u8               dcb_family;
        __u8               cmd;
        __u16              dcb_pad;
 };
@@ -48,6 +50,8 @@ struct dcbmsg {
  * @DCB_CMD_SNUMTCS: set the number of traffic classes
  * @DCB_CMD_GBCN: set backward congestion notification configuration
  * @DCB_CMD_SBCN: get backward congestion notification configration.
+ * @DCB_CMD_GAPP: get application protocol configuration
+ * @DCB_CMD_SAPP: set application protocol configuration
  */
 enum dcbnl_commands {
        DCB_CMD_UNDEFINED,
@@ -78,6 +82,9 @@ enum dcbnl_commands {
        DCB_CMD_BCN_GCFG,
        DCB_CMD_BCN_SCFG,
 
+       DCB_CMD_GAPP,
+       DCB_CMD_SAPP,
+
        __DCB_CMD_ENUM_MAX,
        DCB_CMD_MAX = __DCB_CMD_ENUM_MAX - 1,
 };
@@ -112,6 +119,7 @@ enum dcbnl_attrs {
        DCB_ATTR_CAP,
        DCB_ATTR_NUMTCS,
        DCB_ATTR_BCN,
+       DCB_ATTR_APP,
 
        __DCB_ATTR_ENUM_MAX,
        DCB_ATTR_MAX = __DCB_ATTR_ENUM_MAX - 1,
@@ -336,5 +344,17 @@ enum dcb_general_attr_values {
        DCB_ATTR_VALUE_UNDEFINED = 0xff
 };
 
+#define DCB_APP_IDTYPE_ETHTYPE 0x00
+#define DCB_APP_IDTYPE_PORTNUM 0x01
+enum dcbnl_app_attrs {
+       DCB_APP_ATTR_UNDEFINED,
+
+       DCB_APP_ATTR_IDTYPE,
+       DCB_APP_ATTR_ID,
+       DCB_APP_ATTR_PRIORITY,
+
+       __DCB_APP_ATTR_ENUM_MAX,
+       DCB_APP_ATTR_MAX = __DCB_APP_ATTR_ENUM_MAX - 1,
+};
 
 #endif /* __LINUX_DCBNL_H__ */