[PATCH] libertas: remove adapter->regiontableindex

[linux-2.6-omap-h63xx.git] / drivers / net / b44.h

diff --git a/drivers/net/b44.h b/drivers/net/b44.h
index 4944507fad2381470d9084aad4c9b2b2ba3ebbce..63c55a4ab3cd3a95f0e83919a43c42f82e6ad583 100644 (file)
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@ -308,8 +308,8 @@
 #define  MII_TLEDCTRL_ENABLE   0x0040
 
 struct dma_desc {
-       u32     ctrl;
-       u32     addr;
+       __le32  ctrl;
+       __le32  addr;
 };
 
 /* There are only 12 bits in the DMA engine for descriptor offsetting
@@ -327,9 +327,9 @@ struct dma_desc {
 #define RX_COPY_THRESHOLD      256
 
 struct rx_header {
-       u16     len;
-       u16     flags;
-       u16     pad[12];
+       __le16  len;
+       __le16  flags;
+       __le16  pad[12];
 };
 #define RX_HEADER_LEN  28
 
@@ -423,6 +423,8 @@ struct b44 {
        struct ring_info        *rx_buffers;
        struct ring_info        *tx_buffers;
 
+       struct napi_struct      napi;
+
        u32                     dma_offset;
        u32                     flags;
 #define B44_FLAG_B0_ANDLATER   0x00000001
@@ -443,8 +445,6 @@ struct b44 {
 #define B44_FLAG_TX_RING_HACK  0x40000000
 #define B44_FLAG_WOL_ENABLE    0x80000000
 
-       u32                     rx_offset;
-
        u32                     msg_enable;
 
        struct timer_list       timer;