Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 24703
b: refs/heads/master
c: 5c57807
h: refs/heads/master
i:
  24701: 29dedfc
  24699: a92cf95
  24695: 64eeb70
  24687: cbb2292
  24671: 6e141a0
  24639: 73d51d3
  24575: 9c716ca
v: v3
  • Loading branch information
Michael Buesch authored and John W. Linville committed Mar 27, 2006
1 parent 9e6d747 commit dd5f326
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 69 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: b5488beba8030b791e035c4da0122f98c42e355b
refs/heads/master: 5c57807afcc28a6b8fb579ef2c79e49f0b688425
68 changes: 0 additions & 68 deletions trunk/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,6 @@
/* The WIRELESS_EXT version, which is implemented by this driver. */
#define BCM43xx_WX_VERSION 18


/* Define to enable a printk on each wx handler function invocation */
//#define BCM43xx_WX_DEBUG


#ifdef BCM43xx_WX_DEBUG
# define printk_wx printk
#else
# define printk_wx(x...) do { /* nothing */ } while (0)
#endif
#define wx_enter() printk_wx(KERN_INFO PFX "WX handler called: %s\n", __FUNCTION__);

#define MAX_WX_STRING 80


Expand All @@ -73,8 +61,6 @@ static int bcm43xx_wx_get_name(struct net_device *net_dev,
char suffix[7] = { 0 };
int have_a = 0, have_b = 0, have_g = 0;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
nr_80211 = bcm43xx_num_80211_cores(bcm);
for (i = 0; i < nr_80211; i++) {
Expand Down Expand Up @@ -127,8 +113,6 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
int freq;
int err = 0;

wx_enter();

if ((data->freq.m >= 0) && (data->freq.m <= 1000)) {
channel = data->freq.m;
freq = bcm43xx_channel_to_freq(bcm, channel);
Expand All @@ -148,8 +132,6 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
} else
bcm->current_core->radio->initial_channel = channel;
spin_unlock_irqrestore(&bcm->lock, flags);
if (!err)
printk_wx(KERN_INFO PFX "Selected channel: %d\n", channel);

return err;
}
Expand All @@ -164,8 +146,6 @@ static int bcm43xx_wx_get_channelfreq(struct net_device *net_dev,
int err = -ENODEV;
u16 channel;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
channel = bcm->current_core->radio->channel;
if (channel == 0xFF) {
Expand Down Expand Up @@ -195,8 +175,6 @@ static int bcm43xx_wx_set_mode(struct net_device *net_dev,
unsigned long flags;
int mode;

wx_enter();

mode = data->mode;
if (mode == IW_MODE_AUTO)
mode = BCM43xx_INITIAL_IWMODE;
Expand All @@ -217,8 +195,6 @@ static int bcm43xx_wx_get_mode(struct net_device *net_dev,
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
unsigned long flags;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
data->mode = bcm->ieee->iw_mode;
spin_unlock_irqrestore(&bcm->lock, flags);
Expand All @@ -231,7 +207,6 @@ static int bcm43xx_wx_set_sensitivity(struct net_device *net_dev,
union iwreq_data *data,
char *extra)
{
wx_enter();
/*TODO*/
return 0;
}
Expand All @@ -241,7 +216,6 @@ static int bcm43xx_wx_get_sensitivity(struct net_device *net_dev,
union iwreq_data *data,
char *extra)
{
wx_enter();
/*TODO*/
return 0;
}
Expand All @@ -257,8 +231,6 @@ static int bcm43xx_wx_get_rangeparams(struct net_device *net_dev,
unsigned long flags;
int i, j;

wx_enter();

data->data.length = sizeof(*range);
memset(range, 0, sizeof(*range));

Expand Down Expand Up @@ -355,8 +327,6 @@ static int bcm43xx_wx_set_nick(struct net_device *net_dev,
unsigned long flags;
size_t len;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
len = min((size_t)data->data.length, (size_t)IW_ESSID_MAX_SIZE);
memcpy(bcm->nick, extra, len);
Expand All @@ -375,8 +345,6 @@ static int bcm43xx_wx_get_nick(struct net_device *net_dev,
unsigned long flags;
size_t len;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
len = strlen(bcm->nick) + 1;
memcpy(extra, bcm->nick, len);
Expand All @@ -396,8 +364,6 @@ static int bcm43xx_wx_set_rts(struct net_device *net_dev,
unsigned long flags;
int err = -EINVAL;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
if (data->rts.disabled) {
bcm->rts_threshold = BCM43xx_MAX_RTS_THRESHOLD;
Expand All @@ -422,8 +388,6 @@ static int bcm43xx_wx_get_rts(struct net_device *net_dev,
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
unsigned long flags;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
data->rts.value = bcm->rts_threshold;
data->rts.fixed = 0;
Expand All @@ -442,8 +406,6 @@ static int bcm43xx_wx_set_frag(struct net_device *net_dev,
unsigned long flags;
int err = -EINVAL;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
if (data->frag.disabled) {
bcm->ieee->fts = MAX_FRAG_THRESHOLD;
Expand All @@ -468,8 +430,6 @@ static int bcm43xx_wx_get_frag(struct net_device *net_dev,
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
unsigned long flags;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
data->frag.value = bcm->ieee->fts;
data->frag.fixed = 0;
Expand All @@ -491,8 +451,6 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
int err = -ENODEV;
u16 maxpower;

wx_enter();

if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
printk(PFX KERN_ERR "TX power not in dBm.\n");
return -EOPNOTSUPP;
Expand Down Expand Up @@ -537,8 +495,6 @@ static int bcm43xx_wx_get_xmitpower(struct net_device *net_dev,
unsigned long flags;
int err = -ENODEV;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
if (!bcm->initialized)
goto out_unlock;
Expand All @@ -561,7 +517,6 @@ static int bcm43xx_wx_set_retry(struct net_device *net_dev,
union iwreq_data *data,
char *extra)
{
wx_enter();
/*TODO*/
return 0;
}
Expand All @@ -571,7 +526,6 @@ static int bcm43xx_wx_get_retry(struct net_device *net_dev,
union iwreq_data *data,
char *extra)
{
wx_enter();
/*TODO*/
return 0;
}
Expand All @@ -584,8 +538,6 @@ static int bcm43xx_wx_set_encoding(struct net_device *net_dev,
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
int err;

wx_enter();

err = ieee80211_wx_set_encode(bcm->ieee, info, data, extra);

return err;
Expand All @@ -599,8 +551,6 @@ static int bcm43xx_wx_set_encodingext(struct net_device *net_dev,
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
int err;

wx_enter();

err = ieee80211_wx_set_encodeext(bcm->ieee, info, data, extra);

return err;
Expand All @@ -614,8 +564,6 @@ static int bcm43xx_wx_get_encoding(struct net_device *net_dev,
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
int err;

wx_enter();

err = ieee80211_wx_get_encode(bcm->ieee, info, data, extra);

return err;
Expand All @@ -629,8 +577,6 @@ static int bcm43xx_wx_get_encodingext(struct net_device *net_dev,
struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
int err;

wx_enter();

err = ieee80211_wx_get_encodeext(bcm->ieee, info, data, extra);

return err;
Expand All @@ -641,7 +587,6 @@ static int bcm43xx_wx_set_power(struct net_device *net_dev,
union iwreq_data *data,
char *extra)
{
wx_enter();
/*TODO*/
return 0;
}
Expand All @@ -651,7 +596,6 @@ static int bcm43xx_wx_get_power(struct net_device *net_dev,
union iwreq_data *data,
char *extra)
{
wx_enter();
/*TODO*/
return 0;
}
Expand All @@ -665,8 +609,6 @@ static int bcm43xx_wx_set_interfmode(struct net_device *net_dev,
unsigned long flags;
int mode, err = 0;

wx_enter();

mode = *((int *)extra);
switch (mode) {
case 0:
Expand Down Expand Up @@ -717,8 +659,6 @@ static int bcm43xx_wx_get_interfmode(struct net_device *net_dev,
unsigned long flags;
int mode;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
mode = bcm->current_core->radio->interfmode;
spin_unlock_irqrestore(&bcm->lock, flags);
Expand Down Expand Up @@ -750,8 +690,6 @@ static int bcm43xx_wx_set_shortpreamble(struct net_device *net_dev,
unsigned long flags;
int on;

wx_enter();

on = *((int *)extra);
spin_lock_irqsave(&bcm->lock, flags);
bcm->short_preamble = !!on;
Expand All @@ -769,8 +707,6 @@ static int bcm43xx_wx_get_shortpreamble(struct net_device *net_dev,
unsigned long flags;
int on;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
on = bcm->short_preamble;
spin_unlock_irqrestore(&bcm->lock, flags);
Expand All @@ -793,8 +729,6 @@ static int bcm43xx_wx_set_swencryption(struct net_device *net_dev,
unsigned long flags;
int on;

wx_enter();

on = *((int *)extra);
spin_lock_irqsave(&bcm->lock, flags);
bcm->ieee->host_encrypt = !!on;
Expand All @@ -815,8 +749,6 @@ static int bcm43xx_wx_get_swencryption(struct net_device *net_dev,
unsigned long flags;
int on;

wx_enter();

spin_lock_irqsave(&bcm->lock, flags);
on = bcm->ieee->host_encrypt;
spin_unlock_irqrestore(&bcm->lock, flags);
Expand Down

0 comments on commit dd5f326

Please sign in to comment.