Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release

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

diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index e73a61449ad6dacabc99a2e2372252b8732396fe..b0ef274e00319d575082168ef3bb763fdf6447b9 100644 (file)
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -305,6 +305,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,