projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
b43
/
main.c
diff --git
a/drivers/net/wireless/b43/main.c
b/drivers/net/wireless/b43/main.c
index
75345c1
..
b2f9521
100644
(file)
--- a/
drivers/net/wireless/b43/main.c
+++ b/
drivers/net/wireless/b43/main.c
@@
-4132,7
+4132,7
@@
static void b43_op_bss_info_changed(struct ieee80211_hw *hw,
if (conf->bssid)
memcpy(wl->bssid, conf->bssid, ETH_ALEN);
else
if (conf->bssid)
memcpy(wl->bssid, conf->bssid, ETH_ALEN);
else
-
memset(wl->bssid, 0, ETH_ALEN
);
+
eth_zero_addr(wl->bssid
);
}
if (b43_status(dev) >= B43_STAT_INITIALIZED) {
}
if (b43_status(dev) >= B43_STAT_INITIALIZED) {
@@
-4819,7
+4819,7
@@
static void b43_wireless_core_exit(struct b43_wldev *dev)
switch (dev->dev->bus_type) {
#ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA:
switch (dev->dev->bus_type) {
#ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA:
- bcma_
core
_pci_down(dev->dev->bdev->bus);
+ bcma_
host
_pci_down(dev->dev->bdev->bus);
break;
#endif
#ifdef CONFIG_B43_SSB
break;
#endif
#ifdef CONFIG_B43_SSB
@@
-4866,9
+4866,9
@@
static int b43_wireless_core_init(struct b43_wldev *dev)
switch (dev->dev->bus_type) {
#ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA:
switch (dev->dev->bus_type) {
#ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA:
- bcma_
core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0]
,
+ bcma_
host_pci_irq_ctl(dev->dev->bdev->bus
,
dev->dev->bdev, true);
dev->dev->bdev, true);
- bcma_
core
_pci_up(dev->dev->bdev->bus);
+ bcma_
host
_pci_up(dev->dev->bdev->bus);
break;
#endif
#ifdef CONFIG_B43_SSB
break;
#endif
#ifdef CONFIG_B43_SSB
@@
-5051,7
+5051,7
@@
static void b43_op_remove_interface(struct ieee80211_hw *hw,
wl->operating = false;
b43_adjust_opmode(dev);
wl->operating = false;
b43_adjust_opmode(dev);
-
memset(wl->mac_addr, 0, ETH_ALEN
);
+
eth_zero_addr(wl->mac_addr
);
b43_upload_card_macaddress(dev);
mutex_unlock(&wl->mutex);
b43_upload_card_macaddress(dev);
mutex_unlock(&wl->mutex);
@@
-5067,8
+5067,8
@@
static int b43_op_start(struct ieee80211_hw *hw)
/* Kill all old instance specific information to make sure
* the card won't use it in the short timeframe between start
* and mac80211 reconfiguring it. */
/* Kill all old instance specific information to make sure
* the card won't use it in the short timeframe between start
* and mac80211 reconfiguring it. */
-
memset(wl->bssid, 0, ETH_ALEN
);
-
memset(wl->mac_addr, 0, ETH_ALEN
);
+
eth_zero_addr(wl->bssid
);
+
eth_zero_addr(wl->mac_addr
);
wl->filter_flags = 0;
wl->radiotap_enabled = false;
b43_qos_clear(wl);
wl->filter_flags = 0;
wl->radiotap_enabled = false;
b43_qos_clear(wl);