usbnet: Use wwan%d interface name for mobile broadband devices

[pandora-kernel.git] / drivers / net / amd8111e.h

diff --git a/drivers/net/amd8111e.h b/drivers/net/amd8111e.h
index 7727d32..28c60a7 100644 (file)
--- a/drivers/net/amd8111e.h
+++ b/drivers/net/amd8111e.h
@@ -615,7 +615,7 @@ typedef enum {
 #define SSTATE  2
 
 /* Assume contoller gets data 10 times the maximum processing time */
-#define  REPEAT_CNT                    10;
+#define  REPEAT_CNT                    10
 
 /* amd8111e decriptor flag definitions */
 typedef enum {
@@ -651,40 +651,36 @@ typedef enum {
 /* driver ioctl parameters */
 #define AMD8111E_REG_DUMP_LEN   13*sizeof(u32)
 
-/* crc generator constants */
-#define CRC32 0xedb88320
-#define INITCRC 0xFFFFFFFF
-
 /* amd8111e desriptor format */
 
 struct amd8111e_tx_dr{
 
-       u16 buff_count; /* Size of the buffer pointed by this descriptor */
+       __le16 buff_count; /* Size of the buffer pointed by this descriptor */
 
-       u16 tx_flags;
+       __le16 tx_flags;
 
-       u16 tag_ctrl_info;
+       __le16 tag_ctrl_info;
 
-       u16 tag_ctrl_cmd;
+       __le16 tag_ctrl_cmd;
 
-       u32 buff_phy_addr;
+       __le32 buff_phy_addr;
 
-       u32 reserved;
+       __le32 reserved;
 };
 
 struct amd8111e_rx_dr{
 
-       u32 reserved;
+       __le32 reserved;
 
-       u16 msg_count; /* Received message len */
+       __le16 msg_count; /* Received message len */
 
-       u16 tag_ctrl_info;
+       __le16 tag_ctrl_info;
 
-       u16 buff_count;  /* Len of the buffer pointed by descriptor. */
+       __le16 buff_count;  /* Len of the buffer pointed by descriptor. */
 
-       u16 rx_flags;
+       __le16 rx_flags;
 
-       u32 buff_phy_addr;
+       __le32 buff_phy_addr;
 
 };
 struct amd8111e_link_config{
@@ -767,6 +763,8 @@ struct amd8111e_priv{
        /* Reg memory mapped address */
        void __iomem *mmio;
 
+       struct napi_struct napi;
+
        spinlock_t lock;        /* Guard lock */
        unsigned long rx_idx, tx_idx;   /* The next free ring entry */
        unsigned long tx_complete_idx;