Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38

[mv-sheeva.git] / include / linux / dcbnl.h

diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index 68cd248f6d3e20acba330fc7f9a92df1e3f278ab..66900e3c6eb1ba0c33d741725e7a532f2b555012 100644 (file)
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -101,8 +101,8 @@ struct ieee_pfc {
  */
 struct dcb_app {
        __u8    selector;
-       __u32   protocol;
        __u8    priority;
+       __u16   protocol;
 };
 
 struct dcbmsg {