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

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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents cf84eb0b e4e19c03

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/ath.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ATH_H

#ifndef ATH_H

#define ATH_H

#define ATH_H





#include <linux/etherdevice.h>

#include <linux/skbuff.h>

#include <linux/skbuff.h>

#include <linux/if_ether.h>

#include <linux/if_ether.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>
@@ -165,6 +166,7 @@ struct ath_common { 
struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

				u32 len,

				u32 len,

				gfp_t gfp_mask);

				gfp_t gfp_mask);

bool ath_is_mybeacon(struct ath_common *common, struct ieee80211_hdr *hdr);





void ath_hw_setbssidmask(struct ath_common *common);

void ath_hw_setbssidmask(struct ath_common *common);

void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key);

void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key);

drivers/net/wireless/ath/ath10k/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -37,3 +37,10 @@ config ATH10K_TRACING 
	---help---

	---help---

	  Select this to ath10k use tracing infrastructure.

	  Select this to ath10k use tracing infrastructure.





config ATH10K_DFS_CERTIFIED

	bool "Atheros DFS support for certified platforms"

	depends on ATH10K && CFG80211_CERTIFICATION_ONUS

	default n

	---help---

	This option enables DFS support for initiating radiation on

	ath10k.

drivers/net/wireless/ath/ath10k/core.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -253,6 +253,9 @@ struct ath10k_vif { 
			u8 bssid[ETH_ALEN];

			u8 bssid[ETH_ALEN];

		} ibss;

		} ibss;

	} u;

	} u;



	u8 fixed_rate;

	u8 fixed_nss;

};

};





struct ath10k_vif_iter {

struct ath10k_vif_iter {
@@ -272,6 +275,8 @@ struct ath10k_debug { 
	struct delayed_work htt_stats_dwork;

	struct delayed_work htt_stats_dwork;

	struct ath10k_dfs_stats dfs_stats;

	struct ath10k_dfs_stats dfs_stats;

	struct ath_dfs_pool_stats dfs_pool_stats;

	struct ath_dfs_pool_stats dfs_pool_stats;



	u32 fw_dbglog_mask;

};

};





enum ath10k_state {

enum ath10k_state {
@@ -306,6 +311,9 @@ enum ath10k_fw_features { 
	/* firmware support tx frame management over WMI, otherwise it's HTT */

	/* firmware support tx frame management over WMI, otherwise it's HTT */

	ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX = 2,

	ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX = 2,





	/* Firmware does not support P2P */

	ATH10K_FW_FEATURE_NO_P2P = 3,



	/* keep last */

	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

	ATH10K_FW_FEATURE_COUNT,

};

};
@@ -429,6 +437,9 @@ struct ath10k { 
	struct list_head peers;

	struct list_head peers;

	wait_queue_head_t peer_mapping_wq;

	wait_queue_head_t peer_mapping_wq;





	/* number of created peers; protected by data_lock */

	int num_peers;



	struct work_struct offchan_tx_work;

	struct work_struct offchan_tx_work;

	struct sk_buff_head offchan_tx_queue;

	struct sk_buff_head offchan_tx_queue;

	struct completion offchan_tx_completed;

	struct completion offchan_tx_completed;