aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-12-22 14:29:07 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:08 -0500
commit0569056e0d355f5b9a45c5b16a9b0b65718d077e (patch)
treec3013b255934b2541e077b4ae32efaf64e098175
parentcecefb8e97695eef420aab43938c26141ab25344 (diff)
prism54 trivial annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/prism54/isl_38xx.h10
-rw-r--r--drivers/net/wireless/prism54/islpci_eth.c2
-rw-r--r--drivers/net/wireless/prism54/islpci_eth.h38
-rw-r--r--drivers/net/wireless/prism54/islpci_mgt.h2
4 files changed, 26 insertions, 26 deletions
diff --git a/drivers/net/wireless/prism54/isl_38xx.h b/drivers/net/wireless/prism54/isl_38xx.h
index 3fadcb6f5297..19c33d313734 100644
--- a/drivers/net/wireless/prism54/isl_38xx.h
+++ b/drivers/net/wireless/prism54/isl_38xx.h
@@ -138,14 +138,14 @@ isl38xx_w32_flush(void __iomem *base, u32 val, unsigned long offset)
138#define MAX_FRAGMENT_SIZE_RX 1600 138#define MAX_FRAGMENT_SIZE_RX 1600
139 139
140typedef struct { 140typedef struct {
141 u32 address; /* physical address on host */ 141 __le32 address; /* physical address on host */
142 u16 size; /* packet size */ 142 __le16 size; /* packet size */
143 u16 flags; /* set of bit-wise flags */ 143 __le16 flags; /* set of bit-wise flags */
144} isl38xx_fragment; 144} isl38xx_fragment;
145 145
146struct isl38xx_cb { 146struct isl38xx_cb {
147 u32 driver_curr_frag[ISL38XX_CB_QCOUNT]; 147 __le32 driver_curr_frag[ISL38XX_CB_QCOUNT];
148 u32 device_curr_frag[ISL38XX_CB_QCOUNT]; 148 __le32 device_curr_frag[ISL38XX_CB_QCOUNT];
149 isl38xx_fragment rx_data_low[ISL38XX_CB_RX_QSIZE]; 149 isl38xx_fragment rx_data_low[ISL38XX_CB_RX_QSIZE];
150 isl38xx_fragment tx_data_low[ISL38XX_CB_TX_QSIZE]; 150 isl38xx_fragment tx_data_low[ISL38XX_CB_TX_QSIZE];
151 isl38xx_fragment rx_data_high[ISL38XX_CB_RX_QSIZE]; 151 isl38xx_fragment rx_data_high[ISL38XX_CB_RX_QSIZE];
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index f49eb068c7d0..762e85bef55d 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -471,7 +471,7 @@ islpci_eth_receive(islpci_private *priv)
471 wmb(); 471 wmb();
472 472
473 /* increment the driver read pointer */ 473 /* increment the driver read pointer */
474 add_le32p((u32 *) &control_block-> 474 add_le32p(&control_block->
475 driver_curr_frag[ISL38XX_CB_RX_DATA_LQ], 1); 475 driver_curr_frag[ISL38XX_CB_RX_DATA_LQ], 1);
476 } 476 }
477 477
diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h
index 5bf820defbd0..61454d32d74d 100644
--- a/drivers/net/wireless/prism54/islpci_eth.h
+++ b/drivers/net/wireless/prism54/islpci_eth.h
@@ -23,15 +23,15 @@
23#include "islpci_dev.h" 23#include "islpci_dev.h"
24 24
25struct rfmon_header { 25struct rfmon_header {
26 u16 unk0; /* = 0x0000 */ 26 __le16 unk0; /* = 0x0000 */
27 u16 length; /* = 0x1400 */ 27 __le16 length; /* = 0x1400 */
28 u32 clock; /* 1MHz clock */ 28 __le32 clock; /* 1MHz clock */
29 u8 flags; 29 u8 flags;
30 u8 unk1; 30 u8 unk1;
31 u8 rate; 31 u8 rate;
32 u8 unk2; 32 u8 unk2;
33 u16 freq; 33 __le16 freq;
34 u16 unk3; 34 __le16 unk3;
35 u8 rssi; 35 u8 rssi;
36 u8 padding[3]; 36 u8 padding[3];
37} __attribute__ ((packed)); 37} __attribute__ ((packed));
@@ -47,20 +47,20 @@ struct rx_annex_header {
47#define P80211CAPTURE_VERSION 0x80211001 47#define P80211CAPTURE_VERSION 0x80211001
48 48
49struct avs_80211_1_header { 49struct avs_80211_1_header {
50 uint32_t version; 50 __be32 version;
51 uint32_t length; 51 __be32 length;
52 uint64_t mactime; 52 __be64 mactime;
53 uint64_t hosttime; 53 __be64 hosttime;
54 uint32_t phytype; 54 __be32 phytype;
55 uint32_t channel; 55 __be32 channel;
56 uint32_t datarate; 56 __be32 datarate;
57 uint32_t antenna; 57 __be32 antenna;
58 uint32_t priority; 58 __be32 priority;
59 uint32_t ssi_type; 59 __be32 ssi_type;
60 int32_t ssi_signal; 60 __be32 ssi_signal;
61 int32_t ssi_noise; 61 __be32 ssi_noise;
62 uint32_t preamble; 62 __be32 preamble;
63 uint32_t encoding; 63 __be32 encoding;
64}; 64};
65 65
66void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *); 66void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *);
diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h
index fc53b587b722..f91a88fc1e35 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.h
+++ b/drivers/net/wireless/prism54/islpci_mgt.h
@@ -86,7 +86,7 @@ extern int pc_debug;
86#define PIMFOR_FLAG_LITTLE_ENDIAN 0x02 86#define PIMFOR_FLAG_LITTLE_ENDIAN 0x02
87 87
88static inline void 88static inline void
89add_le32p(u32 * le_number, u32 add) 89add_le32p(__le32 * le_number, u32 add)
90{ 90{
91 *le_number = cpu_to_le32(le32_to_cpup(le_number) + add); 91 *le_number = cpu_to_le32(le32_to_cpup(le_number) + add);
92} 92}