Commit f1335251 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents 559c33d8 26b0e411

drivers/net/wireless/adm8211.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1865,7 +1865,6 @@ static int adm8211_probe(struct pci_dev *pdev, 
	dev->flags = IEEE80211_HW_SIGNAL_UNSPEC;

	dev->flags = IEEE80211_HW_SIGNAL_UNSPEC;

	dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);

	dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);





	dev->channel_change_time = 1000;

	dev->max_signal = 100;    /* FIXME: find better value */

	dev->max_signal = 100;    /* FIXME: find better value */





	dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */

	dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */

drivers/net/wireless/at76c50x-usb.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2112,7 +2112,6 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev) 
	priv->pm_period = 0;

	priv->pm_period = 0;





	/* unit us */

	/* unit us */

	priv->hw->channel_change_time = 100000;





	return priv;

	return priv;

}

}

drivers/net/wireless/ath/ath10k/mac.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -4039,7 +4039,6 @@ int ath10k_mac_register(struct ath10k *ar) 




	ar->hw->vif_data_size = sizeof(struct ath10k_vif);

	ar->hw->vif_data_size = sizeof(struct ath10k_vif);





	ar->hw->channel_change_time = 5000;

	ar->hw->max_listen_interval = ATH10K_MAX_HW_LISTEN_INTERVAL;

	ar->hw->max_listen_interval = ATH10K_MAX_HW_LISTEN_INTERVAL;





	ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;

	ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;

drivers/net/wireless/ath/ath5k/base.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2549,7 +2549,6 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) 
	hw->wiphy->available_antennas_rx = 0x3;

	hw->wiphy->available_antennas_rx = 0x3;





	hw->extra_tx_headroom = 2;

	hw->extra_tx_headroom = 2;

	hw->channel_change_time = 5000;





	/*

	/*

	 * Mark the device as detached to avoid processing

	 * Mark the device as detached to avoid processing

drivers/net/wireless/ath/ath9k/htc_drv_init.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -748,7 +748,6 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, 
			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;

			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;





	hw->queues = 4;

	hw->queues = 4;

	hw->channel_change_time = 5000;

	hw->max_listen_interval = 1;

	hw->max_listen_interval = 1;





	hw->vif_data_size = sizeof(struct ath9k_htc_vif);

	hw->vif_data_size = sizeof(struct ath9k_htc_vif);

CRA Git | Maintained and supported by SUSTech CRA and CCSE