Staging: wlan-ng: block ioctls until card fully initialised (cfde7451) · Commits · 戴 / test

drivers/staging/wlan-ng/p80211netdev.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -567,6 +567,8 @@ 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 =
		@@ -607,6 +609,8 @@ 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 */
		}

		@@ -758,6 +762,11 @@ int wlan_setup(wlandevice_t *wlandev)
		dev->open = p80211knetdev_open;
		dev->stop = p80211knetdev_stop;

		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
		@@ -1098,3 +1107,8 @@ 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);
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -227,6 +227,8 @@ typedef struct wlandevice {
		u8 spy_number;
		char spy_address[IW_MAX_SPY][ETH_ALEN];
		struct iw_quality spy_stat[IW_MAX_SPY];

		struct mutex ioctl_lock;
		} wlandevice_t;

		/* WEP stuff */
		@@ -242,5 +244,5 @@ int register_wlandev(wlandevice_t *wlandev);
		int unregister_wlandev(wlandevice_t *wlandev);
		void p80211netdev_rx(wlandevice_t wlandev, struct sk_buff skb);
		void p80211netdev_hwremoved(wlandevice_t *wlandev);

		void p80211_allow_ioctls(wlandevice_t *wlandev);
		#endif

+1 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,7 @@ failed:
		wlandev = NULL;

		done:
		p80211_allow_ioctls(wlandev);
		usb_set_intfdata(interface, wlandev);
		return result;
		}