#include <linux/device.h>
#include <linux/moduleparam.h>
#include <linux/firmware.h>
+#include <linux/jiffies.h>
#include <net/ieee80211.h>
#include "atmel.h"
SITE_SURVEY_IN_PROGRESS,
SITE_SURVEY_COMPLETED
} site_survey_state;
- time_t last_survey;
+ unsigned long last_survey;
int station_was_associated, station_is_associated;
int fast_scan;
struct net_device *dev;
struct atmel_private *priv;
int rc;
+ DECLARE_MAC_BUF(mac);
/* Create the network device object. */
dev = alloc_etherdev(sizeof(*priv));
if (!ent)
printk(KERN_WARNING "atmel: unable to create /proc entry.\n");
- printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
- dev->name, DRIVER_MAJOR, DRIVER_MINOR,
- dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
- dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5] );
+ printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %s\n",
+ dev->name, DRIVER_MAJOR, DRIVER_MINOR, print_mac(mac, dev->dev_addr));
- SET_MODULE_OWNER(dev);
return dev;
err_out_res:
priv->default_key = index;
} else
/* Don't complain if only change the mode */
- if (!dwrq->flags & IW_ENCODE_MODE) {
+ if (!(dwrq->flags & IW_ENCODE_MODE))
return -EINVAL;
- }
}
/* Read the flags */
if (dwrq->flags & IW_ENCODE_DISABLED) {
return -EAGAIN;
/* Timeout old surveys. */
- if ((jiffies - priv->last_survey) > (20 * HZ))
+ if (time_after(jiffies, priv->last_survey + 20 * HZ))
priv->site_survey_state = SITE_SURVEY_IDLE;
priv->last_survey = jiffies;
}
struct auth_body {
- u16 alg;
- u16 trans_seq;
- u16 status;
+ __le16 alg;
+ __le16 trans_seq;
+ __le16 status;
u8 el_id;
u8 chall_text_len;
u8 chall_text[253];
u8 SSID[MAX_SSID_LENGTH];
u8 scan_type;
u8 channel;
- u16 BSS_type;
- u16 min_channel_time;
- u16 max_channel_time;
+ __le16 BSS_type;
+ __le16 min_channel_time;
+ __le16 max_channel_time;
u8 options;
u8 SSID_size;
} cmd;
u8 SSID[MAX_SSID_LENGTH];
u8 BSS_type; /* this is a short in a scan command - weird */
u8 channel;
- u16 timeout;
+ __le16 timeout;
u8 SSID_size;
u8 reserved;
} cmd;
int bodysize;
struct ieee80211_hdr_4addr header;
struct ass_req_format {
- u16 capability;
- u16 listen_interval;
+ __le16 capability;
+ __le16 listen_interval;
u8 ap[6]; /* nothing after here directly accessible */
u8 ssid_el_id;
u8 ssid_len;
static void associate(struct atmel_private *priv, u16 frame_len, u16 subtype)
{
struct ass_resp_format {
- u16 capability;
- u16 status;
- u16 ass_id;
+ __le16 capability;
+ __le16 status;
+ __le16 ass_id;
u8 el_id;
u8 length;
u8 rates[4];
never let an engineer loose with a data structure design. */
{
struct beacon_format {
- u64 timestamp;
- u16 interval;
- u16 capability;
+ __le64 timestamp;
+ __le16 interval;
+ __le16 capability;
u8 ssid_el_id;
u8 ssid_length;
/* ssid here */