diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 21:30:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 21:30:30 -0400 |
| commit | d1b113bb028999e82a8528e1484be8c23fb5a7d9 (patch) | |
| tree | 18be926b8f7721e98d6a4517ced58b54937645fb /drivers/net/wireless/p54/eeprom.c | |
| parent | 9c5ea3675dbe4853eea747542da257c3e6f18de2 (diff) | |
| parent | cca77b7c81876d819a5806f408b3c29b5b61a815 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
netfilter: fix CONFIG_COMPAT support
isdn/avm: fix build when PCMCIA is not enabled
header: fix broken headers for user space
e1000e: don't check for alternate MAC addr on parts that don't support it
e1000e: disable ASPM L1 on 82573
ll_temac: Fix poll implementation
netxen: fix a race in netxen_nic_get_stats()
qlnic: fix a race in qlcnic_get_stats()
irda: fix a race in irlan_eth_xmit()
net: sh_eth: remove unused variable
netxen: update version 4.0.74
netxen: fix inconsistent lock state
vlan: Match underlying dev carrier on vlan add
ibmveth: Fix opps during MTU change on an active device
ehea: Fix synchronization between HW and SW send queue
bnx2x: Update bnx2x version to 1.52.53-4
bnx2x: Fix PHY locking problem
rds: fix a leak of kernel memory
netlink: fix compat recvmsg
netfilter: fix userspace header warning
...
Diffstat (limited to 'drivers/net/wireless/p54/eeprom.c')
| -rw-r--r-- | drivers/net/wireless/p54/eeprom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c index d687cb7f2a59..78347041ec40 100644 --- a/drivers/net/wireless/p54/eeprom.c +++ b/drivers/net/wireless/p54/eeprom.c | |||
| @@ -167,7 +167,7 @@ static int p54_generate_band(struct ieee80211_hw *dev, | |||
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | if (j == 0) { | 169 | if (j == 0) { |
| 170 | wiphy_err(dev->wiphy, "disabling totally damaged %d GHz band\n", | 170 | wiphy_err(dev->wiphy, "Disabling totally damaged %d GHz band\n", |
| 171 | (band == IEEE80211_BAND_2GHZ) ? 2 : 5); | 171 | (band == IEEE80211_BAND_2GHZ) ? 2 : 5); |
| 172 | 172 | ||
| 173 | ret = -ENODATA; | 173 | ret = -ENODATA; |
| @@ -695,12 +695,12 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) | |||
| 695 | u8 perm_addr[ETH_ALEN]; | 695 | u8 perm_addr[ETH_ALEN]; |
| 696 | 696 | ||
| 697 | wiphy_warn(dev->wiphy, | 697 | wiphy_warn(dev->wiphy, |
| 698 | "invalid hwaddr! using randomly generated mac addr\n"); | 698 | "Invalid hwaddr! Using randomly generated MAC addr\n"); |
| 699 | random_ether_addr(perm_addr); | 699 | random_ether_addr(perm_addr); |
| 700 | SET_IEEE80211_PERM_ADDR(dev, perm_addr); | 700 | SET_IEEE80211_PERM_ADDR(dev, perm_addr); |
| 701 | } | 701 | } |
| 702 | 702 | ||
| 703 | wiphy_info(dev->wiphy, "hwaddr %pm, mac:isl38%02x rf:%s\n", | 703 | wiphy_info(dev->wiphy, "hwaddr %pM, MAC:isl38%02x RF:%s\n", |
| 704 | dev->wiphy->perm_addr, priv->version, | 704 | dev->wiphy->perm_addr, priv->version, |
| 705 | p54_rf_chips[priv->rxhw]); | 705 | p54_rf_chips[priv->rxhw]); |
| 706 | 706 | ||