Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[linux-2.6-omap-h63xx.git] / include / linux / dcbnl.h

diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index e73a61449ad6dacabc99a2e2372252b8732396fe..7d2e10006188415694e16bcbba545f6fd28381de 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;
 };
@@ -305,6 +307,8 @@ enum dcbnl_bcn_attrs{
        DCB_BCN_ATTR_RP_7,
        DCB_BCN_ATTR_RP_ALL,
 
+       DCB_BCN_ATTR_BCNA_0,
+       DCB_BCN_ATTR_BCNA_1,
        DCB_BCN_ATTR_ALPHA,
        DCB_BCN_ATTR_BETA,
        DCB_BCN_ATTR_GD,