Hi Stanislaw,
On 3 feb. 2012, at 13:07, Stanislaw Gruszka <sgruszka@xxxxxxxxxx> wrote:
> Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
> ---
> drivers/net/wireless/iwlegacy/3945-mac.c | 6 ++----
> drivers/net/wireless/iwlegacy/4965-mac.c | 6 ++----
> drivers/net/wireless/iwlegacy/common.c | 29 ++++-------------------------
> drivers/net/wireless/iwlegacy/common.h | 2 --
> drivers/net/wireless/rt2x00/rt2800usb.c | 16 ++--------------
> 5 files changed, 10 insertions(+), 49 deletions(-)
>
There's a change to rt2800usb here that doesn't belong here.
> diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
> index 52cac0c..7c81f5a 100644
> --- a/drivers/net/wireless/iwlegacy/3945-mac.c
> +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
> @@ -3557,7 +3557,8 @@ il3945_setup_mac(struct il_priv *il)
> /* Tell mac80211 our characteristics */
> hw->flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_SPECTRUM_MGMT;
>
> - hw->wiphy->interface_modes = il->ctx.interface_modes;
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
>
> hw->wiphy->flags |=
> WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
> @@ -3617,9 +3618,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
> il->cmd_queue = IL39_CMD_QUEUE_NUM;
>
> - il->ctx.interface_modes =
> - BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
> -
> /*
> * Disabling hardware scan means that mac80211 will perform scans
> * "the hard way", rather than using device's scan.
> diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
> index 35d868c..1dd0014 100644
> --- a/drivers/net/wireless/iwlegacy/4965-mac.c
> +++ b/drivers/net/wireless/iwlegacy/4965-mac.c
> @@ -5454,8 +5454,8 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
> hw->sta_data_size = sizeof(struct il_station_priv);
> hw->vif_data_size = sizeof(struct il_vif_priv);
>
> - hw->wiphy->interface_modes |= il->ctx.interface_modes;
> - hw->wiphy->interface_modes |= il->ctx.exclusive_interface_modes;
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
>
> hw->wiphy->flags |=
> WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS;
> @@ -6141,8 +6141,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> il->ctx.is_active = true;
> il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo;
> il->ctx.ac_to_queue = il4965_bss_ac_to_queue;
> - il->ctx.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC);
> - il->ctx.interface_modes = BIT(NL80211_IFTYPE_STATION);
>
> SET_IEEE80211_DEV(hw, &pdev->dev);
>
> diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
> index ac26985..7f4c6bf 100644
> --- a/drivers/net/wireless/iwlegacy/common.c
> +++ b/drivers/net/wireless/iwlegacy/common.c
> @@ -4566,7 +4566,6 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
> struct il_priv *il = hw->priv;
> struct il_vif_priv *vif_priv = (void *)vif->drv_priv;
> int err;
> - u32 modes;
>
> D_MAC80211("enter: type %d, addr %pM\n", vif->type, vif->addr);
>
> @@ -4578,15 +4577,7 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
> goto out;
> }
>
> - /* check if busy context is exclusive */
> - if (il->ctx.vif &&
> - (il->ctx.exclusive_interface_modes & BIT(il->ctx.vif->type))) {
> - err = -EINVAL;
> - goto out;
> - }
> -
> - modes = il->ctx.interface_modes | il->ctx.exclusive_interface_modes;
> - if (!(modes & BIT(vif->type))) {
> + if (il->ctx.vif) {
> err = -EOPNOTSUPP;
> goto out;
> }
> @@ -4979,10 +4970,10 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> {
> struct il_priv *il = hw->priv;
> struct il_rxon_context *ctx = il_rxon_ctx_from_vif(vif);
> - u32 modes;
> int err;
>
> - newtype = ieee80211_iftype_p2p(newtype, newp2p);
> + if (newp2p)
> + return -EOPNOTSUPP;
>
> mutex_lock(&il->mutex);
>
> @@ -4995,22 +4986,10 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> goto out;
> }
>
> - modes = ctx->interface_modes | ctx->exclusive_interface_modes;
> - if (!(modes & BIT(newtype))) {
> - err = -EOPNOTSUPP;
> - goto out;
> - }
> -
> - if ((il->ctx.exclusive_interface_modes & BIT(il->ctx.vif->type)) ||
> - (il->ctx.exclusive_interface_modes & BIT(newtype))) {
> - err = -EINVAL;
> - goto out;
> - }
> -
> /* success */
> il_teardown_interface(il, vif, true);
> vif->type = newtype;
> - vif->p2p = newp2p;
> + vif->p2p = false;
> err = il_setup_interface(il, ctx);
> WARN_ON(err);
> /*
> diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
> index a872175..eddf22d 100644
> --- a/drivers/net/wireless/iwlegacy/common.h
> +++ b/drivers/net/wireless/iwlegacy/common.h
> @@ -1165,8 +1165,6 @@ struct il_rxon_context {
> */
> bool always_active, is_active;
>
> - u32 interface_modes, exclusive_interface_modes;
> -
> struct il_qos_info qos_data;
>
> struct {
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
> index f0074bc..0807c09 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -272,17 +272,6 @@ static void rt2800usb_disable_radio(struct rt2x00_dev *rt2x00dev)
> rt2x00usb_disable_radio(rt2x00dev);
> }
>
> -static int rt2800usb_set_state(struct rt2x00_dev *rt2x00dev,
> - enum dev_state state)
> -{
> - if (state == STATE_AWAKE)
> - rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 2);
> - else
> - rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0xff, 2);
> -
> - return 0;
> -}
> -
> static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
> enum dev_state state)
> {
> @@ -295,7 +284,7 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
> * to be woken up. After that it needs a bit of time
> * to be fully awake and then the radio can be enabled.
> */
> - rt2800usb_set_state(rt2x00dev, STATE_AWAKE);
> + rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 0);
> msleep(1);
> retval = rt2800usb_enable_radio(rt2x00dev);
> break;
> @@ -305,7 +294,6 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
> * be put to sleep for powersaving.
> */
> rt2800usb_disable_radio(rt2x00dev);
> - rt2800usb_set_state(rt2x00dev, STATE_SLEEP);
> break;
> case STATE_RADIO_IRQ_ON:
> case STATE_RADIO_IRQ_OFF:
> @@ -315,7 +303,7 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
> case STATE_SLEEP:
> case STATE_STANDBY:
> case STATE_AWAKE:
> - retval = rt2800usb_set_state(rt2x00dev, state);
> + rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0xff, 2);
> break;
> default:
> retval = -ENOTSUPP;
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
