Merge branch 'master' of... (8cfe523a) · Commits · e / devices / android_kernel_samsung_universal8890

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

+9 −18

Original line number	Diff line number	Diff line
		@@ -971,6 +971,15 @@ void ath_hw_pll_work(struct work_struct *work)
		hw_pll_work.work);
		u32 pll_sqsum;

		/*
		* ensure that the PLL WAR is executed only
		* after the STA is associated (or) if the
		* beaconing had started in interfaces that
		* uses beacons.
		*/
		if (!(sc->sc_flags & SC_OP_BEACONS))
		return;

		if (AR_SREV_9485(sc->sc_ah)) {

		ath9k_ps_wakeup(sc);
		@@ -1443,15 +1452,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,
		}
		}

		if ((ah->opmode == NL80211_IFTYPE_ADHOC) \|\|
		((vif->type == NL80211_IFTYPE_ADHOC) &&
		sc->nvifs > 0)) {
		ath_err(common, "Cannot create ADHOC interface when other"
		" interfaces already exist.\n");
		ret = -EINVAL;
		goto out;
		}

		ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);

		sc->nvifs++;
		@@ -1476,15 +1476,6 @@ static int ath9k_change_interface(struct ieee80211_hw *hw,
		mutex_lock(&sc->mutex);
		ath9k_ps_wakeup(sc);

		/* See if new interface type is valid. */
		if ((new_type == NL80211_IFTYPE_ADHOC) &&
		(sc->nvifs > 1)) {
		ath_err(common, "When using ADHOC, it must be the only"
		" interface.\n");
		ret = -EINVAL;
		goto out;
		}

		if (ath9k_uses_beacons(new_type) &&
		!ath9k_uses_beacons(vif->type)) {
		if (sc->nbcnvifs >= ATH_BCBUF) {

+11 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,17 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
		struct cfg80211_ap_settings *params) {
		int i;

		if (!params->privacy) {
		bss_config->protocol = PROTOCOL_NO_SECURITY;
		bss_config->key_mgmt = KEY_MGMT_NONE;
		bss_config->wpa_cfg.length = 0;
		priv->sec_info.wep_enabled = 0;
		priv->sec_info.wpa_enabled = 0;
		priv->sec_info.wpa2_enabled = 0;

		return 0;
		}

		switch (params->auth_type) {
		case NL80211_AUTHTYPE_OPEN_SYSTEM:
		bss_config->auth_mode = WLAN_AUTH_OPEN;

+1 −1

Original line number	Diff line number	Diff line
		@@ -2110,7 +2110,7 @@ resize_buf:
		while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
		if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
		matched) {
		if (!ether_addr_equal(bssid->mac, match_bssid))
		if (ether_addr_equal(bssid->mac, match_bssid))
		*matched = true;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -1144,6 +1144,12 @@ struct extended_inquiry_info {
		__u8 data[240];
		} __packed;

		#define HCI_EV_KEY_REFRESH_COMPLETE 0x30
		struct hci_ev_key_refresh_complete {
		__u8 status;
		__le16 handle;
		} __packed;

		#define HCI_EV_IO_CAPA_REQUEST 0x31
		struct hci_ev_io_capa_request {
		bdaddr_t bdaddr;

+6 −0

Original line number	Diff line number	Diff line
		@@ -1940,6 +1940,11 @@ enum ieee80211_rate_control_changed {
		* to also unregister the device. If it returns 1, then mac80211
		* will also go through the regular complete restart on resume.
		*
		* @set_wakeup: Enable or disable wakeup when WoWLAN configuration is
		* modified. The reason is that device_set_wakeup_enable() is
		* supposed to be called when the configuration changes, not only
		* in suspend().
		*
		* @add_interface: Called when a netdevice attached to the hardware is
		* enabled. Because it is not called for monitor mode devices, @start
		* and @stop must be implemented.
		@@ -2966,6 +2971,7 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
		* ieee80211_generic_frame_duration - Calculate the duration field for a frame
		* @hw: pointer obtained from ieee80211_alloc_hw().
		* @vif: &struct ieee80211_vif pointer from the add_interface callback.
		* @band: the band to calculate the frame duration on
		* @frame_len: the length of the frame.
		* @rate: the rate at which the frame is going to be transmitted.
		*