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

Commit 6208f8b2 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

p54: implement rfkill 



This patch implements a basic rfkill support for p54 hardware and
removes a rfkill related WARNING:

fwio.c: In function ‘p54_setup_mac’:
fwio.c:323: warning: ‘radio_enabled’ is deprecated.

by abandoning radio_enable in flavour for IEEE80211_CONF_CHANGE_IDLE.

Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarChristian Lamparter <chunkeey@web.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 718126a7

drivers/net/wireless/p54/fwio.c

+3 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int p54_setup_mac(struct p54_common *priv) 
		return -ENOMEM;



	setup = (struct p54_setup_mac *) skb_put(skb, sizeof(*setup));

	if (priv->hw->conf.radio_enabled) {

	if (!(priv->hw->conf.flags & IEEE80211_CONF_IDLE)) {

		switch (priv->mode) {

		case NL80211_IFTYPE_STATION:

			mode = P54_FILTER_TYPE_STATION;
@@ -348,8 +348,9 @@ int p54_setup_mac(struct p54_common *priv) 
		     (priv->filter_flags & FIF_OTHER_BSS)) &&

		    (mode != P54_FILTER_TYPE_PROMISCUOUS))

			mode |= P54_FILTER_TYPE_TRANSPARENT;

	} else

	} else {

		mode = P54_FILTER_TYPE_HIBERNATE;

	}



	setup->mac_mode = cpu_to_le16(mode);

	memcpy(setup->mac_addr, priv->mac_addr, ETH_ALEN);

drivers/net/wireless/p54/main.c

+5 −0
Original line number Diff line number Diff line
@@ -288,6 +288,11 @@ static int p54_config(struct ieee80211_hw *dev, u32 changed) 
		if (ret)

			goto out;

	}

	if (changed & IEEE80211_CONF_CHANGE_IDLE) {

		ret = p54_setup_mac(priv);

		if (ret)

			goto out;

	}



out:

	mutex_unlock(&priv->conf_mutex);

drivers/net/wireless/p54/txrx.c

+6 −0
Original line number Diff line number Diff line
@@ -552,6 +552,12 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb) 
		break;

	case P54_TRAP_TIMER:

		break;

	case P54_TRAP_FAA_RADIO_OFF:

		wiphy_rfkill_set_hw_state(priv->hw->wiphy, true);

		break;

	case P54_TRAP_FAA_RADIO_ON:

		wiphy_rfkill_set_hw_state(priv->hw->wiphy, false);

		break;

	default:

		printk(KERN_INFO "%s: received event:%x freq:%d\n",

		       wiphy_name(priv->hw->wiphy), event, freq);