Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76963bb6 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwm: port to new cfg80211 rfkill 



Which means removing all rfkill code since it only does
soft-kill which cfg80211 will now handle in exactly the
same way the driver did.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1f87f7d3

drivers/net/wireless/iwmc3200wifi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/net/wireless/iwmc3200wifi/Makefile

+1 −1
Original line number Diff line number Diff line 
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

drivers/net/wireless/iwmc3200wifi/iwm.h

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/iwmc3200wifi/netdev.c

+0 −10
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwmc3200wifi/rfkill.c

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
/*

 * Intel Wireless Multicomm 3200 WiFi driver

 *

 * Copyright (C) 2009 Intel Corporation <ilw@linux.intel.com>

 * Samuel Ortiz <samuel.ortiz@intel.com>

 * Zhu Yi <yi.zhu@intel.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License version

 * 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 *

 */



#include <linux/rfkill.h>



#include "iwm.h"



static int iwm_rfkill_set_block(void *data, bool blocked)

{

	struct iwm_priv *iwm = data;



	if (!blocked) {

		if (test_bit(IWM_RADIO_RFKILL_HW, &iwm->radio))

			return -EBUSY;



		if (test_and_clear_bit(IWM_RADIO_RFKILL_SW, &iwm->radio) &&

		    (iwm_to_ndev(iwm)->flags & IFF_UP))

			return iwm_up(iwm);

	} else {

		if (!test_and_set_bit(IWM_RADIO_RFKILL_SW, &iwm->radio))

			return iwm_down(iwm);

	}



	return 0;

}



static const struct rfkill_ops iwm_rfkill_ops = {

	.set_block = iwm_rfkill_set_block,

};



int iwm_rfkill_init(struct iwm_priv *iwm)

{

	int ret;



	iwm->rfkill = rfkill_alloc(KBUILD_MODNAME,

				   iwm_to_dev(iwm),

				   RFKILL_TYPE_WLAN,

				   &iwm_rfkill_ops, iwm);

	if (!iwm->rfkill) {

		IWM_ERR(iwm, "Unable to allocate rfkill device\n");

		return -ENOMEM;

	}



	ret = rfkill_register(iwm->rfkill);

	if (ret) {

		IWM_ERR(iwm, "Failed to register rfkill device\n");

		goto fail;

	}



	return 0;

 fail:

	rfkill_destroy(iwm->rfkill);

	return ret;

}



void iwm_rfkill_exit(struct iwm_priv *iwm)

{

	if (iwm->rfkill) {

		rfkill_unregister(iwm->rfkill);

		rfkill_destroy(iwm->rfkill);

	}

	iwm->rfkill = NULL;

}