diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-18 16:55:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-18 16:55:28 -0400 |
| commit | aa4a625088f9117f3bebfc21943c3d5d8a4cf81e (patch) | |
| tree | f8ca315db51fa142920983f18160047c4d179d43 /drivers/net/wireless/iwlwifi/dvm/main.c | |
| parent | 2df3b0b7869688c511eada859f1ee3dc13c7cec6 (diff) | |
| parent | a82dda6cd492b8c88952be6f6527f3656f7ac585 (diff) | |
| download | op-kernel-dev-aa4a625088f9117f3bebfc21943c3d5d8a4cf81e.zip op-kernel-dev-aa4a625088f9117f3bebfc21943c3d5d8a4cf81e.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/main.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index ea7e70c..6a6df71 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c @@ -2039,7 +2039,7 @@ static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb) ieee80211_free_txskb(priv->hw, skb); } -static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) +static bool iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) { struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); @@ -2049,6 +2049,8 @@ static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) clear_bit(STATUS_RF_KILL_HW, &priv->status); wiphy_rfkill_set_hw_state(priv->hw->wiphy, state); + + return false; } static const struct iwl_op_mode_ops iwl_dvm_ops = { |
