git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipw2x00: change default policy for auto-associate
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ipw2200.c
diff --git
a/drivers/net/wireless/ipw2200.c
b/drivers/net/wireless/ipw2200.c
index
dcce354
..
6ec6de2
100644
(file)
--- a/
drivers/net/wireless/ipw2200.c
+++ b/
drivers/net/wireless/ipw2200.c
@@
-87,7
+87,7
@@
static int channel = 0;
static int mode = 0;
static u32 ipw_debug_level;
static int mode = 0;
static u32 ipw_debug_level;
-static int associate
= 1
;
+static int associate;
static int auto_create = 1;
static int led = 0;
static int disable = 0;
static int auto_create = 1;
static int led = 0;
static int disable = 0;
@@
-2265,8
+2265,8
@@
static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
return -1;
}
return -1;
}
- IPW_DEBUG_INFO("%s: Setting MAC to %
s
\n",
- priv->net_dev->name,
print_mac(mac, mac)
);
+ IPW_DEBUG_INFO("%s: Setting MAC to %
pM
\n",
+ priv->net_dev->name,
mac
);
return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN, mac);
}
return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN, mac);
}
@@
-3812,7
+3812,6
@@
static u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
{
struct ipw_station_entry entry;
int i;
{
struct ipw_station_entry entry;
int i;
- DECLARE_MAC_BUF(mac);
for (i = 0; i < priv->num_stations; i++) {
if (!memcmp(priv->stations[i], bssid, ETH_ALEN)) {
for (i = 0; i < priv->num_stations; i++) {
if (!memcmp(priv->stations[i], bssid, ETH_ALEN)) {
@@
-3829,7
+3828,7
@@
static u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
if (i == MAX_STATIONS)
return IPW_INVALID_STATION;
if (i == MAX_STATIONS)
return IPW_INVALID_STATION;
- IPW_DEBUG_SCAN("Adding AdHoc station: %
s\n", print_mac(mac, bssid)
);
+ IPW_DEBUG_SCAN("Adding AdHoc station: %
pM\n", bssid
);
entry.reserved = 0;
entry.support_mode = 0;
entry.reserved = 0;
entry.support_mode = 0;
@@
-3856,7
+3855,6
@@
static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid)
static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
{
int err;
static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
{
int err;
- DECLARE_MAC_BUF(mac);
if (priv->status & STATUS_ASSOCIATING) {
IPW_DEBUG_ASSOC("Disassociating while associating.\n");
if (priv->status & STATUS_ASSOCIATING) {
IPW_DEBUG_ASSOC("Disassociating while associating.\n");
@@
-3869,9
+3867,9
@@
static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
return;
}
return;
}
- IPW_DEBUG_ASSOC("Disassocation attempt from %
s
"
+ IPW_DEBUG_ASSOC("Disassocation attempt from %
pM
"
"on channel %d.\n",
"on channel %d.\n",
- pri
nt_mac(mac, priv->assoc_request.bssid)
,
+ pri
v->assoc_request.bssid
,
priv->assoc_request.channel);
priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
priv->assoc_request.channel);
priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
@@
-4397,7
+4395,6
@@
static void handle_scan_event(struct ipw_priv *priv)
static void ipw_rx_notification(struct ipw_priv *priv,
struct ipw_rx_notification *notif)
{
static void ipw_rx_notification(struct ipw_priv *priv,
struct ipw_rx_notification *notif)
{
- DECLARE_MAC_BUF(mac);
u16 size = le16_to_cpu(notif->size);
notif->size = le16_to_cpu(notif->size);
u16 size = le16_to_cpu(notif->size);
notif->size = le16_to_cpu(notif->size);
@@
-4411,11
+4408,10
@@
static void ipw_rx_notification(struct ipw_priv *priv,
case CMAS_ASSOCIATED:{
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
case CMAS_ASSOCIATED:{
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
- "associated: '%s' %s"
- " \n",
+ "associated: '%s' %pM \n",
escape_essid(priv->essid,
priv->essid_len),
escape_essid(priv->essid,
priv->essid_len),
- pri
nt_mac(mac, priv->bssid)
);
+ pri
v->bssid
);
switch (priv->ieee->iw_mode) {
case IW_MODE_INFRA:
switch (priv->ieee->iw_mode) {
case IW_MODE_INFRA:
@@
-4492,13
+4488,13
@@
static void ipw_rx_notification(struct ipw_priv *priv,
IPW_DL_STATE |
IPW_DL_ASSOC,
"deauthenticated: '%s' "
IPW_DL_STATE |
IPW_DL_ASSOC,
"deauthenticated: '%s' "
- "%
s
"
+ "%
pM
"
": (0x%04X) - %s \n",
escape_essid(priv->
essid,
priv->
essid_len),
": (0x%04X) - %s \n",
escape_essid(priv->
essid,
priv->
essid_len),
- pri
nt_mac(mac, priv->bssid)
,
+ pri
v->bssid
,
le16_to_cpu(auth->status),
ipw_get_status_code
(le16_to_cpu
le16_to_cpu(auth->status),
ipw_get_status_code
(le16_to_cpu
@@
-4515,11
+4511,10
@@
static void ipw_rx_notification(struct ipw_priv *priv,
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
- "authenticated: '%s' %s"
- "\n",
+ "authenticated: '%s' %pM\n",
escape_essid(priv->essid,
priv->essid_len),
escape_essid(priv->essid,
priv->essid_len),
- pri
nt_mac(mac, priv->bssid)
);
+ pri
v->bssid
);
break;
}
break;
}
@@
-4544,11
+4539,10
@@
static void ipw_rx_notification(struct ipw_priv *priv,
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
- "disassociated: '%s' %s"
- " \n",
+ "disassociated: '%s' %pM \n",
escape_essid(priv->essid,
priv->essid_len),
escape_essid(priv->essid,
priv->essid_len),
- pri
nt_mac(mac, priv->bssid)
);
+ pri
v->bssid
);
priv->status &=
~(STATUS_DISASSOCIATING |
priv->status &=
~(STATUS_DISASSOCIATING |
@@
-4583,10
+4577,10
@@
static void ipw_rx_notification(struct ipw_priv *priv,
switch (auth->state) {
case CMAS_AUTHENTICATED:
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
switch (auth->state) {
case CMAS_AUTHENTICATED:
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
- "authenticated: '%s' %
s
\n",
+ "authenticated: '%s' %
pM
\n",
escape_essid(priv->essid,
priv->essid_len),
escape_essid(priv->essid,
priv->essid_len),
- pri
nt_mac(mac, priv->bssid)
);
+ pri
v->bssid
);
priv->status |= STATUS_AUTH;
break;
priv->status |= STATUS_AUTH;
break;
@@
-4602,10
+4596,10
@@
static void ipw_rx_notification(struct ipw_priv *priv,
}
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
}
IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
IPW_DL_ASSOC,
- "deauthenticated: '%s' %
s
\n",
+ "deauthenticated: '%s' %
pM
\n",
escape_essid(priv->essid,
priv->essid_len),
escape_essid(priv->essid,
priv->essid_len),
- pri
nt_mac(mac, priv->bssid)
);
+ pri
v->bssid
);
priv->status &= ~(STATUS_ASSOCIATING |
STATUS_AUTH |
priv->status &= ~(STATUS_ASSOCIATING |
STATUS_AUTH |
@@
-5429,27
+5423,25
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
int roaming)
{
struct ipw_supported_rates rates;
int roaming)
{
struct ipw_supported_rates rates;
- DECLARE_MAC_BUF(mac);
- DECLARE_MAC_BUF(mac2);
/* Verify that this network's capability is compatible with the
* current mode (AdHoc or Infrastructure) */
if ((priv->ieee->iw_mode == IW_MODE_ADHOC &&
!(network->capability & WLAN_CAPABILITY_IBSS))) {
/* Verify that this network's capability is compatible with the
* current mode (AdHoc or Infrastructure) */
if ((priv->ieee->iw_mode == IW_MODE_ADHOC &&
!(network->capability & WLAN_CAPABILITY_IBSS))) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded due to "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded due to "
"capability mismatch.\n",
escape_essid(network->ssid, network->ssid_len),
"capability mismatch.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
/* If we do not have an ESSID for this AP, we can not associate with
* it */
if (network->flags & NETWORK_EMPTY_ESSID) {
return 0;
}
/* If we do not have an ESSID for this AP, we can not associate with
* it */
if (network->flags & NETWORK_EMPTY_ESSID) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of hidden ESSID.\n",
escape_essid(network->ssid, network->ssid_len),
"because of hidden ESSID.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
return 0;
}
@@
-5459,11
+5451,11
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
if ((network->ssid_len != match->network->ssid_len) ||
memcmp(network->ssid, match->network->ssid,
network->ssid_len)) {
if ((network->ssid_len != match->network->ssid_len) ||
memcmp(network->ssid, match->network->ssid,
network->ssid_len)) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of non-network ESSID.\n",
escape_essid(network->ssid,
network->ssid_len),
"because of non-network ESSID.\n",
escape_essid(network->ssid,
network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
} else {
return 0;
}
} else {
@@
-5478,9
+5470,9
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
strncpy(escaped,
escape_essid(network->ssid, network->ssid_len),
sizeof(escaped));
strncpy(escaped,
escape_essid(network->ssid, network->ssid_len),
sizeof(escaped));
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of ESSID mismatch: '%s'.\n",
"because of ESSID mismatch: '%s'.\n",
- escaped,
print_mac(mac, network->bssid)
,
+ escaped,
network->bssid
,
escape_essid(priv->essid,
priv->essid_len));
return 0;
escape_essid(priv->essid,
priv->essid_len));
return 0;
@@
-5507,10
+5499,10
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
/* Now go through and see if the requested network is valid... */
if (priv->ieee->scan_age != 0 &&
time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
/* Now go through and see if the requested network is valid... */
if (priv->ieee->scan_age != 0 &&
time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of age: %ums.\n",
escape_essid(network->ssid, network->ssid_len),
"because of age: %ums.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
,
+
network->bssid
,
jiffies_to_msecs(jiffies -
network->last_scanned));
return 0;
jiffies_to_msecs(jiffies -
network->last_scanned));
return 0;
@@
-5518,10
+5510,10
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
if ((priv->config & CFG_STATIC_CHANNEL) &&
(network->channel != priv->channel)) {
if ((priv->config & CFG_STATIC_CHANNEL) &&
(network->channel != priv->channel)) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of channel mismatch: %d != %d.\n",
escape_essid(network->ssid, network->ssid_len),
"because of channel mismatch: %d != %d.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
,
+
network->bssid
,
network->channel, priv->channel);
return 0;
}
network->channel, priv->channel);
return 0;
}
@@
-5529,10
+5521,10
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
/* Verify privacy compatability */
if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
/* Verify privacy compatability */
if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of privacy mismatch: %s != %s.\n",
escape_essid(network->ssid, network->ssid_len),
"because of privacy mismatch: %s != %s.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
,
+
network->bssid
,
priv->
capability & CAP_PRIVACY_ON ? "on" : "off",
network->
priv->
capability & CAP_PRIVACY_ON ? "on" : "off",
network->
@@
-5542,41
+5534,41
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
}
if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
}
if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
- "because of the same BSSID match: %
s
"
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
+ "because of the same BSSID match: %
pM
"
".\n", escape_essid(network->ssid,
network->ssid_len),
".\n", escape_essid(network->ssid,
network->ssid_len),
-
print_mac(mac, network->bssid)
,
- pri
nt_mac(mac2, priv->bssid)
);
+
network->bssid
,
+ pri
v->bssid
);
return 0;
}
/* Filter out any incompatible freq / mode combinations */
if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
return 0;
}
/* Filter out any incompatible freq / mode combinations */
if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of invalid frequency/mode "
"combination.\n",
escape_essid(network->ssid, network->ssid_len),
"because of invalid frequency/mode "
"combination.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
/* Ensure that the rates supported by the driver are compatible with
* this AP, including verification of basic rates (mandatory) */
if (!ipw_compatible_rates(priv, network, &rates)) {
return 0;
}
/* Ensure that the rates supported by the driver are compatible with
* this AP, including verification of basic rates (mandatory) */
if (!ipw_compatible_rates(priv, network, &rates)) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because configured rate mask excludes "
"AP mandatory rate.\n",
escape_essid(network->ssid, network->ssid_len),
"because configured rate mask excludes "
"AP mandatory rate.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
if (rates.num_rates == 0) {
return 0;
}
if (rates.num_rates == 0) {
- IPW_DEBUG_MERGE("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' excluded "
"because of no compatible rates.\n",
escape_essid(network->ssid, network->ssid_len),
"because of no compatible rates.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
return 0;
}
@@
-5587,9
+5579,9
@@
static int ipw_find_adhoc_network(struct ipw_priv *priv,
/* Set up 'new' AP to this network */
ipw_copy_rates(&match->rates, &rates);
match->network = network;
/* Set up 'new' AP to this network */
ipw_copy_rates(&match->rates, &rates);
match->network = network;
- IPW_DEBUG_MERGE("Network '%s (%
s
)' is a viable match.\n",
+ IPW_DEBUG_MERGE("Network '%s (%
pM
)' is a viable match.\n",
escape_essid(network->ssid, network->ssid_len),
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 1;
}
return 1;
}
@@
-5643,7
+5635,6
@@
static int ipw_best_network(struct ipw_priv *priv,
struct ieee80211_network *network, int roaming)
{
struct ipw_supported_rates rates;
struct ieee80211_network *network, int roaming)
{
struct ipw_supported_rates rates;
- DECLARE_MAC_BUF(mac);
/* Verify that this network's capability is compatible with the
* current mode (AdHoc or Infrastructure) */
/* Verify that this network's capability is compatible with the
* current mode (AdHoc or Infrastructure) */
@@
-5651,20
+5642,20
@@
static int ipw_best_network(struct ipw_priv *priv,
!(network->capability & WLAN_CAPABILITY_ESS)) ||
(priv->ieee->iw_mode == IW_MODE_ADHOC &&
!(network->capability & WLAN_CAPABILITY_IBSS))) {
!(network->capability & WLAN_CAPABILITY_ESS)) ||
(priv->ieee->iw_mode == IW_MODE_ADHOC &&
!(network->capability & WLAN_CAPABILITY_IBSS))) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded due to "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded due to "
"capability mismatch.\n",
escape_essid(network->ssid, network->ssid_len),
"capability mismatch.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
/* If we do not have an ESSID for this AP, we can not associate with
* it */
if (network->flags & NETWORK_EMPTY_ESSID) {
return 0;
}
/* If we do not have an ESSID for this AP, we can not associate with
* it */
if (network->flags & NETWORK_EMPTY_ESSID) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of hidden ESSID.\n",
escape_essid(network->ssid, network->ssid_len),
"because of hidden ESSID.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
return 0;
}
@@
-5674,11
+5665,11
@@
static int ipw_best_network(struct ipw_priv *priv,
if ((network->ssid_len != match->network->ssid_len) ||
memcmp(network->ssid, match->network->ssid,
network->ssid_len)) {
if ((network->ssid_len != match->network->ssid_len) ||
memcmp(network->ssid, match->network->ssid,
network->ssid_len)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of non-network ESSID.\n",
escape_essid(network->ssid,
network->ssid_len),
"because of non-network ESSID.\n",
escape_essid(network->ssid,
network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
} else {
return 0;
}
} else {
@@
-5692,9
+5683,9
@@
static int ipw_best_network(struct ipw_priv *priv,
strncpy(escaped,
escape_essid(network->ssid, network->ssid_len),
sizeof(escaped));
strncpy(escaped,
escape_essid(network->ssid, network->ssid_len),
sizeof(escaped));
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of ESSID mismatch: '%s'.\n",
"because of ESSID mismatch: '%s'.\n",
- escaped,
print_mac(mac, network->bssid)
,
+ escaped,
network->bssid
,
escape_essid(priv->essid,
priv->essid_len));
return 0;
escape_essid(priv->essid,
priv->essid_len));
return 0;
@@
-5708,12
+5699,12
@@
static int ipw_best_network(struct ipw_priv *priv,
strncpy(escaped,
escape_essid(network->ssid, network->ssid_len),
sizeof(escaped));
strncpy(escaped,
escape_essid(network->ssid, network->ssid_len),
sizeof(escaped));
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded because "
- "'%s (%
s
)' has a stronger signal.\n",
- escaped,
print_mac(mac, network->bssid)
,
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded because "
+ "'%s (%
pM
)' has a stronger signal.\n",
+ escaped,
network->bssid
,
escape_essid(match->network->ssid,
match->network->ssid_len),
escape_essid(match->network->ssid,
match->network->ssid_len),
-
print_mac(mac, match->network->bssid)
);
+
match->network->bssid
);
return 0;
}
return 0;
}
@@
-5721,11
+5712,11
@@
static int ipw_best_network(struct ipw_priv *priv,
* last 3 seconds, do not try and associate again... */
if (network->last_associate &&
time_after(network->last_associate + (HZ * 3UL), jiffies)) {
* last 3 seconds, do not try and associate again... */
if (network->last_associate &&
time_after(network->last_associate + (HZ * 3UL), jiffies)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of storming (%ums since last "
"assoc attempt).\n",
escape_essid(network->ssid, network->ssid_len),
"because of storming (%ums since last "
"assoc attempt).\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
,
+
network->bssid
,
jiffies_to_msecs(jiffies -
network->last_associate));
return 0;
jiffies_to_msecs(jiffies -
network->last_associate));
return 0;
@@
-5734,10
+5725,10
@@
static int ipw_best_network(struct ipw_priv *priv,
/* Now go through and see if the requested network is valid... */
if (priv->ieee->scan_age != 0 &&
time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
/* Now go through and see if the requested network is valid... */
if (priv->ieee->scan_age != 0 &&
time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of age: %ums.\n",
escape_essid(network->ssid, network->ssid_len),
"because of age: %ums.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
,
+
network->bssid
,
jiffies_to_msecs(jiffies -
network->last_scanned));
return 0;
jiffies_to_msecs(jiffies -
network->last_scanned));
return 0;
@@
-5745,10
+5736,10
@@
static int ipw_best_network(struct ipw_priv *priv,
if ((priv->config & CFG_STATIC_CHANNEL) &&
(network->channel != priv->channel)) {
if ((priv->config & CFG_STATIC_CHANNEL) &&
(network->channel != priv->channel)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of channel mismatch: %d != %d.\n",
escape_essid(network->ssid, network->ssid_len),
"because of channel mismatch: %d != %d.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
,
+
network->bssid
,
network->channel, priv->channel);
return 0;
}
network->channel, priv->channel);
return 0;
}
@@
-5756,10
+5747,10
@@
static int ipw_best_network(struct ipw_priv *priv,
/* Verify privacy compatability */
if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
/* Verify privacy compatability */
if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of privacy mismatch: %s != %s.\n",
escape_essid(network->ssid, network->ssid_len),
"because of privacy mismatch: %s != %s.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
,
+
network->bssid
,
priv->capability & CAP_PRIVACY_ON ? "on" :
"off",
network->capability &
priv->capability & CAP_PRIVACY_ON ? "on" :
"off",
network->capability &
@@
-5769,48
+5760,48
@@
static int ipw_best_network(struct ipw_priv *priv,
if ((priv->config & CFG_STATIC_BSSID) &&
memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
if ((priv->config & CFG_STATIC_BSSID) &&
memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
- "because of BSSID mismatch: %
s
.\n",
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
+ "because of BSSID mismatch: %
pM
.\n",
escape_essid(network->ssid, network->ssid_len),
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid), print_mac(mac, priv->bssid)
);
+
network->bssid, priv->bssid
);
return 0;
}
/* Filter out any incompatible freq / mode combinations */
if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
return 0;
}
/* Filter out any incompatible freq / mode combinations */
if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of invalid frequency/mode "
"combination.\n",
escape_essid(network->ssid, network->ssid_len),
"because of invalid frequency/mode "
"combination.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
/* Filter out invalid channel in current GEO */
if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) {
return 0;
}
/* Filter out invalid channel in current GEO */
if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of invalid channel in current GEO\n",
escape_essid(network->ssid, network->ssid_len),
"because of invalid channel in current GEO\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
/* Ensure that the rates supported by the driver are compatible with
* this AP, including verification of basic rates (mandatory) */
if (!ipw_compatible_rates(priv, network, &rates)) {
return 0;
}
/* Ensure that the rates supported by the driver are compatible with
* this AP, including verification of basic rates (mandatory) */
if (!ipw_compatible_rates(priv, network, &rates)) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because configured rate mask excludes "
"AP mandatory rate.\n",
escape_essid(network->ssid, network->ssid_len),
"because configured rate mask excludes "
"AP mandatory rate.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
if (rates.num_rates == 0) {
return 0;
}
if (rates.num_rates == 0) {
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' excluded "
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' excluded "
"because of no compatible rates.\n",
escape_essid(network->ssid, network->ssid_len),
"because of no compatible rates.\n",
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 0;
}
return 0;
}
@@
-5822,9
+5813,9
@@
static int ipw_best_network(struct ipw_priv *priv,
ipw_copy_rates(&match->rates, &rates);
match->network = network;
ipw_copy_rates(&match->rates, &rates);
match->network = network;
- IPW_DEBUG_ASSOC("Network '%s (%
s
)' is a viable match.\n",
+ IPW_DEBUG_ASSOC("Network '%s (%
pM
)' is a viable match.\n",
escape_essid(network->ssid, network->ssid_len),
escape_essid(network->ssid, network->ssid_len),
-
print_mac(mac, network->bssid)
);
+
network->bssid
);
return 1;
}
return 1;
}
@@
-6066,7
+6057,6
@@
static void ipw_bg_adhoc_check(struct work_struct *work)
static void ipw_debug_config(struct ipw_priv *priv)
{
static void ipw_debug_config(struct ipw_priv *priv)
{
- DECLARE_MAC_BUF(mac);
IPW_DEBUG_INFO("Scan completed, no valid APs matched "
"[CFG 0x%08X]\n", priv->config);
if (priv->config & CFG_STATIC_CHANNEL)
IPW_DEBUG_INFO("Scan completed, no valid APs matched "
"[CFG 0x%08X]\n", priv->config);
if (priv->config & CFG_STATIC_CHANNEL)
@@
-6079,8
+6069,7
@@
static void ipw_debug_config(struct ipw_priv *priv)
else
IPW_DEBUG_INFO("ESSID unlocked.\n");
if (priv->config & CFG_STATIC_BSSID)
else
IPW_DEBUG_INFO("ESSID unlocked.\n");
if (priv->config & CFG_STATIC_BSSID)
- IPW_DEBUG_INFO("BSSID locked to %s\n",
- print_mac(mac, priv->bssid));
+ IPW_DEBUG_INFO("BSSID locked to %pM\n", priv->bssid);
else
IPW_DEBUG_INFO("BSSID unlocked.\n");
if (priv->capability & CAP_PRIVACY_ON)
else
IPW_DEBUG_INFO("BSSID unlocked.\n");
if (priv->capability & CAP_PRIVACY_ON)
@@
-7295,7
+7284,6
@@
static int ipw_associate_network(struct ipw_priv *priv,
struct ipw_supported_rates *rates, int roaming)
{
int err;
struct ipw_supported_rates *rates, int roaming)
{
int err;
- DECLARE_MAC_BUF(mac);
if (priv->config & CFG_FIXED_RATE)
ipw_set_fixed_rate(priv, network->mode);
if (priv->config & CFG_FIXED_RATE)
ipw_set_fixed_rate(priv, network->mode);
@@
-7463,9
+7451,9
@@
static int ipw_associate_network(struct ipw_priv *priv,
return err;
}
return err;
}
- IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %
s
\n",
+ IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %
pM
\n",
escape_essid(priv->essid, priv->essid_len),
escape_essid(priv->essid, priv->essid_len),
- pri
nt_mac(mac, priv->bssid)
);
+ pri
v->bssid
);
return 0;
}
return 0;
}
@@
-7604,7
+7592,6
@@
static int ipw_associate(void *data)
if (list_empty(&priv->ieee->network_free_list)) {
struct ieee80211_network *oldest = NULL;
struct ieee80211_network *target;
if (list_empty(&priv->ieee->network_free_list)) {
struct ieee80211_network *oldest = NULL;
struct ieee80211_network *target;
- DECLARE_MAC_BUF(mac);
list_for_each_entry(target, &priv->ieee->network_list, list) {
if ((oldest == NULL) ||
list_for_each_entry(target, &priv->ieee->network_list, list) {
if ((oldest == NULL) ||
@@
-7615,11
+7602,11
@@
static int ipw_associate(void *data)
/* If there are no more slots, expire the oldest */
list_del(&oldest->list);
target = oldest;
/* If there are no more slots, expire the oldest */
list_del(&oldest->list);
target = oldest;
- IPW_DEBUG_ASSOC("Expired '%s' (%
s
) from "
+ IPW_DEBUG_ASSOC("Expired '%s' (%
pM
) from "
"network list.\n",
escape_essid(target->ssid,
target->ssid_len),
"network list.\n",
escape_essid(target->ssid,
target->ssid_len),
-
print_mac(mac, target->bssid)
);
+
target->bssid
);
list_add_tail(&target->list,
&priv->ieee->network_free_list);
}
list_add_tail(&target->list,
&priv->ieee->network_free_list);
}
@@
-8301,9
+8288,6
@@
static void ipw_rx(struct ipw_priv *priv)
u32 r, w, i;
u8 network_packet;
u8 fill_rx = 0;
u32 r, w, i;
u8 network_packet;
u8 fill_rx = 0;
- DECLARE_MAC_BUF(mac);
- DECLARE_MAC_BUF(mac2);
- DECLARE_MAC_BUF(mac3);
r = ipw_read32(priv, IPW_RX_READ_INDEX);
w = ipw_read32(priv, IPW_RX_WRITE_INDEX);
r = ipw_read32(priv, IPW_RX_READ_INDEX);
w = ipw_read32(priv, IPW_RX_WRITE_INDEX);
@@
-8433,18
+8417,12
@@
static void ipw_rx(struct ipw_priv *priv)
header)))
{
IPW_DEBUG_DROP("Dropping: "
header)))
{
IPW_DEBUG_DROP("Dropping: "
- "%s, "
- "%s, "
- "%s\n",
- print_mac(mac,
- header->
- addr1),
- print_mac(mac2,
- header->
- addr2),
- print_mac(mac3,
- header->
- addr3));
+ "%pM, "
+ "%pM, "
+ "%pM\n",
+ header->addr1,
+ header->addr2,
+ header->addr3);
break;
}
break;
}
@@
-8983,7
+8961,6
@@
static int ipw_wx_set_wap(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
struct ipw_priv *priv = ieee80211_priv(dev);
union iwreq_data *wrqu, char *extra)
{
struct ipw_priv *priv = ieee80211_priv(dev);
- DECLARE_MAC_BUF(mac);
static const unsigned char any[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff
static const unsigned char any[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff
@@
-9014,8
+8991,8
@@
static int ipw_wx_set_wap(struct net_device *dev,
return 0;
}
return 0;
}
- IPW_DEBUG_WX("Setting mandatory BSSID to %
s
\n",
-
print_mac(mac, wrqu->ap_addr.sa_data)
);
+ IPW_DEBUG_WX("Setting mandatory BSSID to %
pM
\n",
+
wrqu->ap_addr.sa_data
);
memcpy(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
memcpy(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
@@
-9033,7
+9010,6
@@
static int ipw_wx_get_wap(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
struct ipw_priv *priv = ieee80211_priv(dev);
union iwreq_data *wrqu, char *extra)
{
struct ipw_priv *priv = ieee80211_priv(dev);
- DECLARE_MAC_BUF(mac);
/* If we are associated, trying to associate, or have a statically
* configured BSSID then return that; otherwise return ANY */
/* If we are associated, trying to associate, or have a statically
* configured BSSID then return that; otherwise return ANY */
@@
-9045,8
+9021,8
@@
static int ipw_wx_get_wap(struct net_device *dev,
} else
memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
} else
memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
- IPW_DEBUG_WX("Getting WAP BSSID: %
s
\n",
-
print_mac(mac, wrqu->ap_addr.sa_data)
);
+ IPW_DEBUG_WX("Getting WAP BSSID: %
pM
\n",
+
wrqu->ap_addr.sa_data
);
mutex_unlock(&priv->mutex);
return 0;
}
mutex_unlock(&priv->mutex);
return 0;
}
@@
-10199,10
+10175,8
@@
static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
id = ipw_add_station(priv, hdr->addr1);
if (id == IPW_INVALID_STATION) {
IPW_WARNING("Attempt to send data to "
id = ipw_add_station(priv, hdr->addr1);
if (id == IPW_INVALID_STATION) {
IPW_WARNING("Attempt to send data to "
- "invalid cell: " MAC_FMT "\n",
- hdr->addr1[0], hdr->addr1[1],
- hdr->addr1[2], hdr->addr1[3],
- hdr->addr1[4], hdr->addr1[5]);
+ "invalid cell: %pM\n",
+ hdr->addr1);
goto drop;
}
}
goto drop;
}
}
@@
-10505,15
+10479,14
@@
static int ipw_net_set_mac_address(struct net_device *dev, void *p)
{
struct ipw_priv *priv = ieee80211_priv(dev);
struct sockaddr *addr = p;
{
struct ipw_priv *priv = ieee80211_priv(dev);
struct sockaddr *addr = p;
- DECLARE_MAC_BUF(mac);
if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;
mutex_lock(&priv->mutex);
priv->config |= CFG_CUSTOM_MAC;
memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;
mutex_lock(&priv->mutex);
priv->config |= CFG_CUSTOM_MAC;
memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
- printk(KERN_INFO "%s: Setting MAC to %
s
\n",
- priv->net_dev->name, pri
nt_mac(mac, priv->mac_addr)
);
+ printk(KERN_INFO "%s: Setting MAC to %
pM
\n",
+ priv->net_dev->name, pri
v->mac_addr
);
queue_work(priv->workqueue, &priv->adapter_restart);
mutex_unlock(&priv->mutex);
return 0;
queue_work(priv->workqueue, &priv->adapter_restart);
mutex_unlock(&priv->mutex);
return 0;
@@
-11648,7
+11621,7
@@
static int __devinit ipw_pci_probe(struct pci_dev *pdev,
length = pci_resource_len(pdev, 0);
priv->hw_len = length;
length = pci_resource_len(pdev, 0);
priv->hw_len = length;
- base =
ioremap_nocache(pci_resource_start(pdev, 0), length
);
+ base =
pci_ioremap_bar(pdev, 0
);
if (!base) {
err = -ENODEV;
goto out_pci_release_regions;
if (!base) {
err = -ENODEV;
goto out_pci_release_regions;
@@
-11940,7
+11913,7
@@
module_param(disable, int, 0444);
MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
module_param(associate, int, 0444);
MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
module_param(associate, int, 0444);
-MODULE_PARM_DESC(associate, "auto associate when scanning (default o
n
)");
+MODULE_PARM_DESC(associate, "auto associate when scanning (default o
ff
)");
module_param(auto_create, int, 0444);
MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");
module_param(auto_create, int, 0444);
MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");