Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

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

diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
index 183ed04..775cfc8 100644 (file)
--- a/include/net/dcbnl.h
+++ b/include/net/dcbnl.h
@@ -26,7 +26,7 @@
  */
 struct dcbnl_rtnl_ops {
        u8   (*getstate)(struct net_device *);
-       void (*setstate)(struct net_device *, u8);
+       u8   (*setstate)(struct net_device *, u8);
        void (*getpermhwaddr)(struct net_device *, u8 *);
        void (*setpgtccfgtx)(struct net_device *, int, u8, u8, u8, u8);
        void (*setpgbwgcfgtx)(struct net_device *, int, u8);
@@ -40,6 +40,14 @@ struct dcbnl_rtnl_ops {
        void (*getpfccfg)(struct net_device *, int, u8 *);
        u8   (*setall)(struct net_device *);
        u8   (*getcap)(struct net_device *, int, u8 *);
+       u8   (*getnumtcs)(struct net_device *, int, u8 *);
+       u8   (*setnumtcs)(struct net_device *, int, u8);
+       u8   (*getpfcstate)(struct net_device *);
+       void (*setpfcstate)(struct net_device *, u8);
+       void (*getbcncfg)(struct net_device *, int, u32 *);
+       void (*setbcncfg)(struct net_device *, int, u32);
+       void (*getbcnrp)(struct net_device *, int, u8 *);
+       void (*setbcnrp)(struct net_device *, int, u8);
 };
 
 #endif /* __NET_DCBNL_H__ */