---

yaml
---
r: 150687
b: refs/heads/master
c: 76963bb
h: refs/heads/master
i:
  150685: 086d4d4
  150683: 7016b6f
  150679: 5fe8af7
  150671: c103418
  150655: f5eb9eb
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f87f7d3a3b42b20f34cb03f0fd1a41c3d0e27f3
+refs/heads/master: 76963bb602ba91927130a0140d5757a5969e08ac

trunk/drivers/net/wireless/iwmc3200wifi/Kconfig

@@ -4,7 +4,6 @@ config IWM
 	select WIRELESS_EXT
 	select CFG80211
 	select FW_LOADER
-	select RFKILL
 
 config IWM_DEBUG
 	bool "Enable full debugging output in iwmc3200wifi"

trunk/drivers/net/wireless/iwmc3200wifi/Makefile

@@ -1,5 +1,5 @@
 obj-$(CONFIG_IWM) := iwmc3200wifi.o
 iwmc3200wifi-objs += main.o netdev.o rx.o tx.o sdio.o hal.o fw.o
-iwmc3200wifi-objs += commands.o wext.o cfg80211.o eeprom.o rfkill.o
+iwmc3200wifi-objs += commands.o wext.o cfg80211.o eeprom.o
 
 iwmc3200wifi-$(CONFIG_IWM_DEBUG) += debugfs.o

trunk/drivers/net/wireless/iwmc3200wifi/iwm.h

@@ -343,8 +343,4 @@ int iwm_rx_handle_resp(struct iwm_priv *iwm, u8 *buf, unsigned long buf_size,
 		       struct iwm_wifi_cmd *cmd);
 void iwm_rx_free(struct iwm_priv *iwm);
 
-/* RF Kill API */
-int iwm_rfkill_init(struct iwm_priv *iwm);
-void iwm_rfkill_exit(struct iwm_priv *iwm);
-
 #endif

trunk/drivers/net/wireless/iwmc3200wifi/netdev.c

@@ -136,17 +136,8 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
 
 	wdev->netdev = ndev;
 
-	ret = iwm_rfkill_init(iwm);
-	if (ret) {
-		dev_err(dev, "Failed to init rfkill\n");
-		goto out_rfkill;
-	}
-
 	return iwm;
 
- out_rfkill:
-	unregister_netdev(ndev);
-
  out_ndev:
 	free_netdev(ndev);
 
@@ -162,7 +153,6 @@ void iwm_if_free(struct iwm_priv *iwm)
 	if (!iwm_to_ndev(iwm))
 		return;
 
-	iwm_rfkill_exit(iwm);
 	unregister_netdev(iwm_to_ndev(iwm));
 	free_netdev(iwm_to_ndev(iwm));
 	iwm_wdev_free(iwm);