Commit 3cfe91c4 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: always shut down on HW rfkill 



When the RFKILL subsystem isn't available, then rfkill_blocked()
always returns false. In the case of hardware rfkill this will
be wrong though, as if the hardware reported being killed then
it cannot operate any longer.

Since we only ever call the rfkill_sync work in this case, just
rename it to rfkill_block and always pass "true" for the blocked
parameter, rather than passing rfkill_blocked().

We rely on the underlying driver to still reject any new attempt
to bring up the device by itself.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/20190830112451.21655-2-luca@coelho.fi


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e5c0b0ff

net/wireless/core.c

+7 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2010		Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2015-2017	Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018-2019 Intel Corporation

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -300,12 +300,13 @@ static int cfg80211_rfkill_set_block(void *data, bool blocked) 
	return 0;

}



static void cfg80211_rfkill_sync_work(struct work_struct *work)

static void cfg80211_rfkill_block_work(struct work_struct *work)

{

	struct cfg80211_registered_device *rdev;



	rdev = container_of(work, struct cfg80211_registered_device, rfkill_sync);

	cfg80211_rfkill_set_block(rdev, rfkill_blocked(rdev->rfkill));

	rdev = container_of(work, struct cfg80211_registered_device,

			    rfkill_block);

	cfg80211_rfkill_set_block(rdev, true);

}



static void cfg80211_event_work(struct work_struct *work)
@@ -516,7 +517,7 @@ use_default_name: 
		return NULL;

	}



	INIT_WORK(&rdev->rfkill_sync, cfg80211_rfkill_sync_work);

	INIT_WORK(&rdev->rfkill_block, cfg80211_rfkill_block_work);

	INIT_WORK(&rdev->conn_work, cfg80211_conn_work);

	INIT_WORK(&rdev->event_work, cfg80211_event_work);
@@ -1061,7 +1062,7 @@ void wiphy_rfkill_set_hw_state(struct wiphy *wiphy, bool blocked) 
	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);



	if (rfkill_set_hw_state(rdev->rfkill, blocked))

		schedule_work(&rdev->rfkill_sync);

		schedule_work(&rdev->rfkill_block);

}

EXPORT_SYMBOL(wiphy_rfkill_set_hw_state);

net/wireless/core.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct cfg80211_registered_device { 
	/* rfkill support */

	struct rfkill_ops rfkill_ops;

	struct rfkill *rfkill;

	struct work_struct rfkill_sync;

	struct work_struct rfkill_block;



	/* ISO / IEC 3166 alpha2 for which this device is receiving

	 * country IEs on, this can help disregard country IEs from APs

net/wireless/wext-compat.c

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * we directly assign the wireless handlers of wireless interfaces.

 *

 * Copyright 2008-2009	Johannes Berg <johannes@sipsolutions.net>

 * Copyright (C) 2019 Intel Corporation

 */



#include <linux/export.h>
@@ -864,8 +865,8 @@ static int cfg80211_wext_siwtxpower(struct net_device *dev, 
			}

		}

	} else {

		rfkill_set_sw_state(rdev->rfkill, true);

		schedule_work(&rdev->rfkill_sync);

		if (rfkill_set_sw_state(rdev->rfkill, true))

			schedule_work(&rdev->rfkill_block);

		return 0;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE