Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[deliverable/linux.git] / include / linux / msi.h

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 5025ca4d91e4a558b0abfec10b46532122c91cf6..6991ab5b24d1bbfd736df4d27315a83ee7271779 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -21,15 +21,15 @@ extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
 struct msi_desc {
        struct {
                __u8    is_msix : 1;
+               __u8    multiple: 3;    /* log2 number of messages */
                __u8    maskbit : 1;    /* mask-pending bit supported ?   */
-               __u8    masked  : 1;
                __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit  */
                __u8    pos;            /* Location of the msi capability */
                __u16   entry_nr;       /* specific enabled entry         */
-               __u32   maskbits_mask;  /* mask bits mask */
                unsigned default_irq;   /* default pre-assigned irq       */
-       }msi_attrib;
+       } msi_attrib;
 
+       u32 masked;                     /* mask bits */
        unsigned int irq;
        struct list_head list;