Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 15:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Browse Source
This commit is contained in:
David S. Miller 2011-07-27 22:18:47 -07:00
commit b49179c071
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/b43/Kconfig
View File

@ -28,7 +28,7 @@ config B43
config B43_BCMA config B43_BCMA
bool "Support for BCMA bus" bool "Support for BCMA bus"
depends on B43 && BCMA && BROKEN depends on B43 && BCMA
default y default y
config B43_SSB config B43_SSB

2
drivers/net/wireless/b43/bus.c
View File

@ -244,10 +244,12 @@ void b43_bus_set_wldev(struct b43_bus_dev *dev, void *wldev)
#ifdef CONFIG_B43_BCMA #ifdef CONFIG_B43_BCMA
case B43_BUS_BCMA: case B43_BUS_BCMA:
bcma_set_drvdata(dev->bdev, wldev); bcma_set_drvdata(dev->bdev, wldev);
break;
#endif #endif
#ifdef CONFIG_B43_SSB #ifdef CONFIG_B43_SSB
case B43_BUS_SSB: case B43_BUS_SSB:
ssb_set_drvdata(dev->sdev, wldev); ssb_set_drvdata(dev->sdev, wldev);
break;
#endif #endif
} }
} }

5
drivers/net/wireless/b43/main.c
View File

@ -5350,6 +5350,7 @@ static void b43_ssb_remove(struct ssb_device *sdev)
{ {
struct b43_wl *wl = ssb_get_devtypedata(sdev); struct b43_wl *wl = ssb_get_devtypedata(sdev);
struct b43_wldev *wldev = ssb_get_drvdata(sdev); struct b43_wldev *wldev = ssb_get_drvdata(sdev);
struct b43_bus_dev *dev = wldev->dev;
/* We must cancel any work here before unregistering from ieee80211, /* We must cancel any work here before unregistering from ieee80211,
* as the ieee80211 unreg will destroy the workqueue. */ * as the ieee80211 unreg will destroy the workqueue. */
@ -5365,14 +5366,14 @@ static void b43_ssb_remove(struct ssb_device *sdev)
ieee80211_unregister_hw(wl->hw); ieee80211_unregister_hw(wl->hw);
} }
b43_one_core_detach(wldev->dev); b43_one_core_detach(dev);
if (list_empty(&wl->devlist)) { if (list_empty(&wl->devlist)) {
b43_leds_unregister(wl); b43_leds_unregister(wl);
/* Last core on the chip unregistered. /* Last core on the chip unregistered.
* We can destroy common struct b43_wl. * We can destroy common struct b43_wl.
*/ */
b43_wireless_exit(wldev->dev, wl); b43_wireless_exit(dev, wl);
} }
} }

2
drivers/nfc/pn533.c
View File

@ -1596,7 +1596,7 @@ static void pn533_disconnect(struct usb_interface *interface)
usb_free_urb(dev->out_urb); usb_free_urb(dev->out_urb);
kfree(dev); kfree(dev);
nfc_dev_info(&dev->interface->dev, "NXP PN533 NFC device disconnected"); nfc_dev_info(&interface->dev, "NXP PN533 NFC device disconnected");
} }
static struct usb_driver pn533_driver = { static struct usb_driver pn533_driver = {

7
net/wireless/reg.c
View File

@ -903,7 +903,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
!is_world_regdom(last_request->alpha2)) { !is_world_regdom(last_request->alpha2)) {
REG_DBG_PRINT("Ignoring regulatory request %s " REG_DBG_PRINT("Ignoring regulatory request %s "
"since the driver requires its own regulaotry " "since the driver requires its own regulatory "
"domain to be set first", "domain to be set first",
reg_initiator_name(initiator)); reg_initiator_name(initiator));
return true; return true;
@ -1125,12 +1125,13 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
enum ieee80211_band band; enum ieee80211_band band;
if (ignore_reg_update(wiphy, initiator)) if (ignore_reg_update(wiphy, initiator))
goto out; return;
for (band = 0; band < IEEE80211_NUM_BANDS; band++) { for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (wiphy->bands[band]) if (wiphy->bands[band])
handle_band(wiphy, band, initiator); handle_band(wiphy, band, initiator);
} }
out:
reg_process_beacons(wiphy); reg_process_beacons(wiphy);
reg_process_ht_flags(wiphy); reg_process_ht_flags(wiphy);
if (wiphy->reg_notifier) if (wiphy->reg_notifier)