Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next (0af5491c) · Commits · 戴 / test

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3627,6 +3627,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
		wiphy->cipher_suites = cipher_suites;
		wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);

		#ifdef CONFIG_PM
		wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT \|
		WIPHY_WOWLAN_DISCONNECT \|
		WIPHY_WOWLAN_GTK_REKEY_FAILURE \|
		@@ -3636,6 +3637,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
		wiphy->wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST;
		wiphy->wowlan.pattern_min_len = 1;
		wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
		#endif

		wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;

+3 −3

Original line number	Diff line number	Diff line
		@@ -277,11 +277,11 @@ static void carl9170_tx_release(struct kref *ref)
		return;

		BUILD_BUG_ON(
		offsetof(struct ieee80211_tx_info, status.ampdu_ack_len) != 23);
		offsetof(struct ieee80211_tx_info, status.ack_signal) != 20);

		memset(&txinfo->status.ampdu_ack_len, 0,
		memset(&txinfo->status.ack_signal, 0,
		sizeof(struct ieee80211_tx_info) -
		offsetof(struct ieee80211_tx_info, status.ampdu_ack_len));
		offsetof(struct ieee80211_tx_info, status.ack_signal));

		if (atomic_read(&ar->tx_total_queued))
		ar->tx_schedule = true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -946,7 +946,7 @@ il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
		case IEEE80211_BAND_5GHZ:
		rs_sta->expected_tpt = il3945_expected_tpt_a;
		break;
		case IEEE80211_NUM_BANDS:
		default:
		BUG();
		break;
		}

+10 −2

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ struct mac80211_hwsim_data {
		struct list_head list;
		struct ieee80211_hw *hw;
		struct device *dev;
		struct ieee80211_supported_band bands[2];
		struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
		struct ieee80211_channel channels_2ghz[ARRAY_SIZE(hwsim_channels_2ghz)];
		struct ieee80211_channel channels_5ghz[ARRAY_SIZE(hwsim_channels_5ghz)];
		struct ieee80211_rate rates[ARRAY_SIZE(hwsim_rates)];
		@@ -1082,6 +1082,8 @@ enum hwsim_testmode_attr {
		enum hwsim_testmode_cmd {
		HWSIM_TM_CMD_SET_PS = 0,
		HWSIM_TM_CMD_GET_PS = 1,
		HWSIM_TM_CMD_STOP_QUEUES = 2,
		HWSIM_TM_CMD_WAKE_QUEUES = 3,
		};

		static const struct nla_policy hwsim_testmode_policy[HWSIM_TM_ATTR_MAX + 1] = {
		@@ -1121,6 +1123,12 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw,
		if (nla_put_u32(skb, HWSIM_TM_ATTR_PS, hwsim->ps))
		goto nla_put_failure;
		return cfg80211_testmode_reply(skb);
		case HWSIM_TM_CMD_STOP_QUEUES:
		ieee80211_stop_queues(hw);
		return 0;
		case HWSIM_TM_CMD_WAKE_QUEUES:
		ieee80211_wake_queues(hw);
		return 0;
		default:
		return -EOPNOTSUPP;
		}
		@@ -1855,7 +1863,7 @@ static int __init init_mac80211_hwsim(void)
		sband->n_bitrates = ARRAY_SIZE(hwsim_rates) - 4;
		break;
		default:
		break;
		continue;
		}

		sband->ht_cap.ht_supported = true;

+3 −3

Original line number	Diff line number	Diff line
		@@ -422,11 +422,11 @@ static void p54_rx_frame_sent(struct p54_common priv, struct sk_buff skb)
		* Clear manually, ieee80211_tx_info_clear_status would
		* clear the counts too and we need them.
		*/
		memset(&info->status.ampdu_ack_len, 0,
		memset(&info->status.ack_signal, 0,
		sizeof(struct ieee80211_tx_info) -
		offsetof(struct ieee80211_tx_info, status.ampdu_ack_len));
		offsetof(struct ieee80211_tx_info, status.ack_signal));
		BUILD_BUG_ON(offsetof(struct ieee80211_tx_info,
		status.ampdu_ack_len) != 23);
		status.ack_signal) != 20);

		if (entry_hdr->flags & cpu_to_le16(P54_HDR_FLAG_DATA_ALIGN))
		pad = entry_data->align[0];