Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24744
b: refs/heads/master
c: 8afceb1
h: refs/heads/master
v: v3
  • Loading branch information
Michael Buesch authored and John W. Linville committed Mar 27, 2006
1 parent 2134620 commit 3761b3b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b5e868edbeaa5fd832d42563195c0da00edfd3c9
refs/heads/master: 8afceb1e6a3b6361c7c2456ef488ee9c6db7b370
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2509,7 +2509,7 @@ static int bcm43xx_validate_chip(struct bcm43xx_private *bcm)
return -ENODEV;
}

void bcm43xx_init_struct_phyinfo(struct bcm43xx_phyinfo *phy)
static void bcm43xx_init_struct_phyinfo(struct bcm43xx_phyinfo *phy)
{
/* Initialize a "phyinfo" structure. The structure is already
* zeroed out.
Expand All @@ -2521,7 +2521,7 @@ void bcm43xx_init_struct_phyinfo(struct bcm43xx_phyinfo *phy)
spin_lock_init(&phy->lock);
}

void bcm43xx_init_struct_radioinfo(struct bcm43xx_radioinfo *radio)
static void bcm43xx_init_struct_radioinfo(struct bcm43xx_radioinfo *radio)
{
/* Initialize a "radioinfo" structure. The structure is already
* zeroed out.
Expand Down
11 changes: 8 additions & 3 deletions trunk/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1057,9 +1057,14 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)
bcm43xx_phy_write(bcm, 0x002F, 0x0202);
}

if ((bcm->sprom.boardflags & BCM43xx_BFL_RSSI) == 0) {
FIXME();//FIXME: 0x7FFFFFFF should be 16-bit !
bcm43xx_nrssi_hw_update(bcm, (u16)0x7FFFFFFF);
if (!(bcm->sprom.boardflags & BCM43xx_BFL_RSSI)) {
/* The specs state to update the NRSSI LT with
* the value 0x7FFFFFFF here. I think that is some weird
* compiler optimization in the original driver.
* Essentially, what we do here is resetting all NRSSI LT
* entries to -32 (see the limit_value() in nrssi_hw_update())
*/
bcm43xx_nrssi_hw_update(bcm, 0xFFFF);
bcm43xx_calc_nrssi_threshold(bcm);
} else if (phy->connected) {
if (radio->nrssi[0] == -1000) {
Expand Down

0 comments on commit 3761b3b

Please sign in to comment.