Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 (a80f509f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/ath5k/base.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ static int ath5k_pci_resume(struct pci_dev *pdev);
		#define ath5k_pci_resume NULL
		#endif /* CONFIG_PM */

		static struct pci_driver ath5k_pci_drv_id = {
		static struct pci_driver ath5k_pci_driver = {
		.name = "ath5k_pci",
		.id_table = ath5k_pci_id_table,
		.probe = ath5k_pci_probe,
		@@ -329,7 +329,7 @@ init_ath5k_pci(void)

		ath5k_debug_init();

		ret = pci_register_driver(&ath5k_pci_drv_id);
		ret = pci_register_driver(&ath5k_pci_driver);
		if (ret) {
		printk(KERN_ERR "ath5k_pci: can't register pci driver\n");
		return ret;
		@@ -341,7 +341,7 @@ init_ath5k_pci(void)
		static void __exit
		exit_ath5k_pci(void)
		{
		pci_unregister_driver(&ath5k_pci_drv_id);
		pci_unregister_driver(&ath5k_pci_driver);

		ath5k_debug_finish();
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -238,7 +238,8 @@ void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, struct iwl3945_rx_mem_b
		priv->last_statistics_time = jiffies;
		}

		void iwl3945_add_radiotap(struct iwl3945_priv priv, struct sk_buff skb,
		static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
		struct sk_buff *skb,
		struct iwl3945_rx_frame_hdr *rx_hdr,
		struct ieee80211_rx_status *stats)
		{

+18 −5

Original line number	Diff line number	Diff line
		@@ -4658,17 +4658,30 @@ void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,
		struct ieee80211_ht_info *sta_ht_inf)
		{
		__le32 sta_flags;
		u8 mimo_ps_mode;

		if (!sta_ht_inf \|\| !sta_ht_inf->ht_supported)
		goto done;

		mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2;

		sta_flags = priv->stations[index].sta.station_flags;

		if (((sta_ht_inf->cap & IEEE80211_HT_CAP_MIMO_PS >> 2))
		== IWL_MIMO_PS_DYNAMIC)
		sta_flags &= ~(STA_FLG_RTS_MIMO_PROT_MSK \| STA_FLG_MIMO_DIS_MSK);

		switch (mimo_ps_mode) {
		case WLAN_HT_CAP_MIMO_PS_STATIC:
		sta_flags \|= STA_FLG_MIMO_DIS_MSK;
		break;
		case WLAN_HT_CAP_MIMO_PS_DYNAMIC:
		sta_flags \|= STA_FLG_RTS_MIMO_PROT_MSK;
		else
		sta_flags &= ~STA_FLG_RTS_MIMO_PROT_MSK;
		break;
		case WLAN_HT_CAP_MIMO_PS_DISABLED:
		break;
		default:
		IWL_WARNING("Invalid MIMO PS mode %d", mimo_ps_mode);
		break;
		}

		sta_flags \|= cpu_to_le32(
		(u32)sta_ht_inf->ampdu_factor << STA_FLG_MAX_AGG_SIZE_POS);
		@@ -4679,7 +4692,7 @@ void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,
		if (iwl4965_is_fat_tx_allowed(priv, sta_ht_inf))
		sta_flags \|= STA_FLG_FAT_EN_MSK;
		else
		sta_flags &= (~STA_FLG_FAT_EN_MSK);
		sta_flags &= ~STA_FLG_FAT_EN_MSK;

		priv->stations[index].sta.station_flags = sta_flags;
		done:

+0 −3

Original line number	Diff line number	Diff line
		@@ -147,9 +147,6 @@ static inline struct ieee80211_conf *ieee80211_get_hw_conf(

		#define QOS_CONTROL_LEN 2

		#define IEEE80211_STYPE_BACK_REQ 0x0080
		#define IEEE80211_STYPE_BACK 0x0090


		static inline int ieee80211_is_management(u16 fc)
		{

+5 −5

Original line number	Diff line number	Diff line
		@@ -6330,6 +6330,11 @@ static int __iwl3945_up(struct iwl3945_priv *priv)
		return -ENODEV;
		}

		if (!priv->ucode_data_backup.v_addr \|\| !priv->ucode_data.v_addr) {
		IWL_ERROR("ucode not available for device bringup\n");
		return -EIO;
		}

		/* If platform's RF_KILL switch is NOT set to KILL */
		if (iwl3945_read32(priv, CSR_GP_CNTRL) &
		CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
		@@ -6342,11 +6347,6 @@ static int __iwl3945_up(struct iwl3945_priv *priv)
		}
		}

		if (!priv->ucode_data_backup.v_addr \|\| !priv->ucode_data.v_addr) {
		IWL_ERROR("ucode not available for device bringup\n");
		return -EIO;
		}

		iwl3945_write32(priv, CSR_INT, 0xFFFFFFFF);

		rc = iwl3945_hw_nic_init(priv);