Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 194172
b: refs/heads/master
c: 9fd1ea4
h: refs/heads/master
v: v3
  • Loading branch information
Frans Pop authored and John W. Linville committed Mar 31, 2010
1 parent 10ed1ad commit 29cadd0
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 879999cec9489f8942ebce3ec1b5f23ef948dda7
refs/heads/master: 9fd1ea428590cf6e35e5a7df32ff6bccfd371db2
38 changes: 19 additions & 19 deletions trunk/drivers/net/wireless/ipw2x00/ipw2100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2140,7 +2140,7 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
DECLARE_SSID_BUF(ssid);

IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
"disassociated: '%s' %pM \n",
"disassociated: '%s' %pM\n",
print_ssid(ssid, priv->essid, priv->essid_len),
priv->bssid);

Expand Down Expand Up @@ -3285,7 +3285,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)

if (inta & IPW2100_INTA_PARITY_ERROR) {
printk(KERN_ERR DRV_NAME
": ***** PARITY ERROR INTERRUPT !!!! \n");
": ***** PARITY ERROR INTERRUPT !!!!\n");
priv->inta_other++;
write_register(dev, IPW_REG_INTA, IPW2100_INTA_PARITY_ERROR);
}
Expand Down Expand Up @@ -6753,7 +6753,7 @@ static int ipw2100_wx_set_freq(struct net_device *dev,
err = -EOPNOTSUPP;
goto done;
} else { /* Set the channel */
IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
IPW_DEBUG_WX("SET Freq/Channel -> %d\n", fwrq->m);
err = ipw2100_set_channel(priv, fwrq->m, 0);
}

Expand Down Expand Up @@ -6782,7 +6782,7 @@ static int ipw2100_wx_get_freq(struct net_device *dev,
else
wrqu->freq.m = 0;

IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel);
IPW_DEBUG_WX("GET Freq/Channel -> %d\n", priv->channel);
return 0;

}
Expand All @@ -6794,7 +6794,7 @@ static int ipw2100_wx_set_mode(struct net_device *dev,
struct ipw2100_priv *priv = libipw_priv(dev);
int err = 0;

IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode);
IPW_DEBUG_WX("SET Mode -> %d\n", wrqu->mode);

if (wrqu->mode == priv->ieee->iw_mode)
return 0;
Expand Down Expand Up @@ -7149,7 +7149,7 @@ static int ipw2100_wx_set_nick(struct net_device *dev,
memset(priv->nick, 0, sizeof(priv->nick));
memcpy(priv->nick, extra, wrqu->data.length);

IPW_DEBUG_WX("SET Nickname -> %s \n", priv->nick);
IPW_DEBUG_WX("SET Nickname -> %s\n", priv->nick);

return 0;
}
Expand All @@ -7168,7 +7168,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev,
memcpy(extra, priv->nick, wrqu->data.length);
wrqu->data.flags = 1; /* active */

IPW_DEBUG_WX("GET Nickname -> %s \n", extra);
IPW_DEBUG_WX("GET Nickname -> %s\n", extra);

return 0;
}
Expand Down Expand Up @@ -7207,7 +7207,7 @@ static int ipw2100_wx_set_rate(struct net_device *dev,

err = ipw2100_set_tx_rates(priv, rate, 0);

IPW_DEBUG_WX("SET Rate -> %04X \n", rate);
IPW_DEBUG_WX("SET Rate -> %04X\n", rate);
done:
mutex_unlock(&priv->action_mutex);
return err;
Expand Down Expand Up @@ -7258,7 +7258,7 @@ static int ipw2100_wx_get_rate(struct net_device *dev,
wrqu->bitrate.value = 0;
}

IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
IPW_DEBUG_WX("GET Rate -> %d\n", wrqu->bitrate.value);

done:
mutex_unlock(&priv->action_mutex);
Expand Down Expand Up @@ -7294,7 +7294,7 @@ static int ipw2100_wx_set_rts(struct net_device *dev,

err = ipw2100_set_rts_threshold(priv, value);

IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X \n", value);
IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X\n", value);
done:
mutex_unlock(&priv->action_mutex);
return err;
Expand All @@ -7316,7 +7316,7 @@ static int ipw2100_wx_get_rts(struct net_device *dev,
/* If RTS is set to the default value, then it is disabled */
wrqu->rts.disabled = (priv->rts_threshold & RTS_DISABLED) ? 1 : 0;

IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X \n", wrqu->rts.value);
IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X\n", wrqu->rts.value);

return 0;
}
Expand Down Expand Up @@ -7355,7 +7355,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,

err = ipw2100_set_tx_power(priv, value);

IPW_DEBUG_WX("SET TX Power -> %d \n", value);
IPW_DEBUG_WX("SET TX Power -> %d\n", value);

done:
mutex_unlock(&priv->action_mutex);
Expand Down Expand Up @@ -7384,7 +7384,7 @@ static int ipw2100_wx_get_txpow(struct net_device *dev,

wrqu->txpower.flags = IW_TXPOW_DBM;

IPW_DEBUG_WX("GET TX Power -> %d \n", wrqu->txpower.value);
IPW_DEBUG_WX("GET TX Power -> %d\n", wrqu->txpower.value);

return 0;
}
Expand Down Expand Up @@ -7414,7 +7414,7 @@ static int ipw2100_wx_set_frag(struct net_device *dev,
priv->frag_threshold = priv->ieee->fts;
}

IPW_DEBUG_WX("SET Frag Threshold -> %d \n", priv->ieee->fts);
IPW_DEBUG_WX("SET Frag Threshold -> %d\n", priv->ieee->fts);

return 0;
}
Expand All @@ -7432,7 +7432,7 @@ static int ipw2100_wx_get_frag(struct net_device *dev,
wrqu->frag.fixed = 0; /* no auto select */
wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;

IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
IPW_DEBUG_WX("GET Frag Threshold -> %d\n", wrqu->frag.value);

return 0;
}
Expand All @@ -7458,14 +7458,14 @@ static int ipw2100_wx_set_retry(struct net_device *dev,

if (wrqu->retry.flags & IW_RETRY_SHORT) {
err = ipw2100_set_short_retry(priv, wrqu->retry.value);
IPW_DEBUG_WX("SET Short Retry Limit -> %d \n",
IPW_DEBUG_WX("SET Short Retry Limit -> %d\n",
wrqu->retry.value);
goto done;
}

if (wrqu->retry.flags & IW_RETRY_LONG) {
err = ipw2100_set_long_retry(priv, wrqu->retry.value);
IPW_DEBUG_WX("SET Long Retry Limit -> %d \n",
IPW_DEBUG_WX("SET Long Retry Limit -> %d\n",
wrqu->retry.value);
goto done;
}
Expand All @@ -7474,7 +7474,7 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
if (!err)
err = ipw2100_set_long_retry(priv, wrqu->retry.value);

IPW_DEBUG_WX("SET Both Retry Limits -> %d \n", wrqu->retry.value);
IPW_DEBUG_WX("SET Both Retry Limits -> %d\n", wrqu->retry.value);

done:
mutex_unlock(&priv->action_mutex);
Expand Down Expand Up @@ -7508,7 +7508,7 @@ static int ipw2100_wx_get_retry(struct net_device *dev,
wrqu->retry.value = priv->short_retry_limit;
}

IPW_DEBUG_WX("GET Retry -> %d \n", wrqu->retry.value);
IPW_DEBUG_WX("GET Retry -> %d\n", wrqu->retry.value);

return 0;
}
Expand Down
Loading

0 comments on commit 29cadd0

Please sign in to comment.