diff options
Diffstat (limited to 'drivers/net/wireless/prism54/islpci_eth.h')
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.h | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h index bc9d7a60b8d..80f50f1bc6f 100644 --- a/drivers/net/wireless/prism54/islpci_eth.h +++ b/drivers/net/wireless/prism54/islpci_eth.h @@ -1,5 +1,4 @@ /* - * * Copyright (C) 2002 Intersil Americas Inc. * * This program is free software; you can redistribute it and/or modify @@ -12,8 +11,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program; if not, see <http://www.gnu.org/licenses/>. * */ @@ -24,50 +22,50 @@ #include "islpci_dev.h" struct rfmon_header { - u16 unk0; /* = 0x0000 */ - u16 length; /* = 0x1400 */ - u32 clock; /* 1MHz clock */ + __le16 unk0; /* = 0x0000 */ + __le16 length; /* = 0x1400 */ + __le32 clock; /* 1MHz clock */ u8 flags; u8 unk1; u8 rate; u8 unk2; - u16 freq; - u16 unk3; + __le16 freq; + __le16 unk3; u8 rssi; u8 padding[3]; -} __attribute__ ((packed)); +} __packed; struct rx_annex_header { u8 addr1[ETH_ALEN]; u8 addr2[ETH_ALEN]; struct rfmon_header rfmon; -} __attribute__ ((packed)); +} __packed; /* wlan-ng (and hopefully others) AVS header, version one. Fields in * network byte order. */ #define P80211CAPTURE_VERSION 0x80211001 struct avs_80211_1_header { - uint32_t version; - uint32_t length; - uint64_t mactime; - uint64_t hosttime; - uint32_t phytype; - uint32_t channel; - uint32_t datarate; - uint32_t antenna; - uint32_t priority; - uint32_t ssi_type; - int32_t ssi_signal; - int32_t ssi_noise; - uint32_t preamble; - uint32_t encoding; + __be32 version; + __be32 length; + __be64 mactime; + __be64 hosttime; + __be32 phytype; + __be32 channel; + __be32 datarate; + __be32 antenna; + __be32 priority; + __be32 ssi_type; + __be32 ssi_signal; + __be32 ssi_noise; + __be32 preamble; + __be32 encoding; }; void islpci_eth_cleanup_transmit(islpci_private *, isl38xx_control_block *); -int islpci_eth_transmit(struct sk_buff *, struct net_device *); +netdev_tx_t islpci_eth_transmit(struct sk_buff *, struct net_device *); int islpci_eth_receive(islpci_private *); void islpci_eth_tx_timeout(struct net_device *); -void islpci_do_reset_and_wake(void *data); +void islpci_do_reset_and_wake(struct work_struct *); #endif /* _ISL_GEN_H */ |