[UDP]: Clean up UDP-Lite receive checksum

[safe/jmp/linux-2.6] / include / linux / msi.h

diff --git a/include/linux/msi.h b/include/linux/msi.h
index c7ef943..e38fe68 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -7,18 +7,17 @@ struct msi_msg {
        u32     data;           /* 16 bits of msi message data */
 };
 
-/* Heper functions */
+/* Helper functions */
 extern void mask_msi_irq(unsigned int irq);
 extern void unmask_msi_irq(unsigned int irq);
 extern void read_msi_msg(unsigned int irq, struct msi_msg *msg);
-
 extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
 
 struct msi_desc {
        struct {
                __u8    type    : 5;    /* {0: unused, 5h:MSI, 11h:MSI-X} */
                __u8    maskbit : 1;    /* mask-pending bit supported ?   */
-               __u8    unused  : 1;
+               __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         */
@@ -33,16 +32,14 @@ struct msi_desc {
        void __iomem *mask_base;
        struct pci_dev *dev;
 
-#ifdef CONFIG_PM
-       /* PM save area for MSIX address/data */
-       struct msi_msg msg_save;
-#endif
+       /* Last set MSI message */
+       struct msi_msg msg;
 };
 
 /*
  * The arch hook for setup up msi irqs
  */
-int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev);
+int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc);
 void arch_teardown_msi_irq(unsigned int irq);