Staging: wlan-ng: Move firmware loading into driver

Move prism2 firmware loading from userspace into driver, using linux
request_firmware(). Firmware is now loaded (if available) on device
probing, before it is registered as a netdevice and advertised to userspace.

Signed-off-by: Karl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 0 insertions, 14 deletions

diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index d88184d73a8..ef8e459214b 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -566,8 +566,6 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
 
         pr_debug("rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len);
 
-        mutex_lock(&wlandev->ioctl_lock);
-
 #ifdef SIOCETHTOOL
         if (cmd == SIOCETHTOOL) {
                 result =
@@ -608,8 +606,6 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
                 result = -ENOMEM;
         }
 bail:
-        mutex_unlock(&wlandev->ioctl_lock);
-
         return result;          /* If allocate,copyfrom or copyto fails, return errno */
 }
 
@@ -771,11 +767,6 @@ int wlan_setup(wlandevice_t *wlandev)
                 dev->ml_priv = wlandev;
                 dev->netdev_ops = &p80211_netdev_ops;
 
-                mutex_init(&wlandev->ioctl_lock);
-                /* block ioctls until fully initialised. Don't forget to call
-                   allow_ioctls at some point!*/
-                mutex_lock(&wlandev->ioctl_lock);
-
 #if (WIRELESS_EXT < 21)
                 dev->get_wireless_stats = p80211wext_get_wireless_stats;
 #endif
@@ -1116,8 +1107,3 @@ static void p80211knetdev_tx_timeout(netdevice_t *netdev)
                 netif_wake_queue(wlandev->netdev);
         }
 }
-
-void p80211_allow_ioctls(wlandevice_t *wlandev)
-{
-        mutex_unlock(&wlandev->ioctl_lock);
-}