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

drivers/net/wireless/ath/ar9170/usb.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -94,6 +94,8 @@ static struct usb_device_id ar9170_usb_ids[] = {
		{ USB_DEVICE(0x04bb, 0x093f) },
		/* AVM FRITZ!WLAN USB Stick N */
		{ USB_DEVICE(0x057C, 0x8401) },
		/* NEC WL300NU-G */
		{ USB_DEVICE(0x0409, 0x0249) },
		/* AVM FRITZ!WLAN USB Stick N 2.4 */
		{ USB_DEVICE(0x057C, 0x8402), .driver_info = AR9170_REQ_FW1_ONLY },

		@@ -416,7 +418,7 @@ static int ar9170_usb_exec_cmd(struct ar9170 *ar, enum ar9170_cmd cmd,
		spin_unlock_irqrestore(&aru->common.cmdlock, flags);

		usb_fill_int_urb(urb, aru->udev,
		usb_sndbulkpipe(aru->udev, AR9170_EP_CMD),
		usb_sndintpipe(aru->udev, AR9170_EP_CMD),
		aru->common.cmdbuf, plen + 4,
		ar9170_usb_tx_urb_complete, NULL, 1);

+2 −4

Original line number	Diff line number	Diff line
		@@ -2041,15 +2041,13 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
		tx_resp->failure_frame);

		freed = iwl_tx_queue_reclaim(priv, txq_id, index);
		if (qc && likely(sta_id != IWL_INVALID_STATION))
		priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
		iwl_free_tfds_in_queue(priv, sta_id, tid, freed);

		if (priv->mac80211_registered &&
		(iwl_queue_space(&txq->q) > txq->q.low_mark))
		iwl_wake_queue(priv, txq_id);
		}

		if (qc && likely(sta_id != IWL_INVALID_STATION))
		iwl_txq_check_empty(priv, sta_id, tid, txq_id);

		if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))

+10 −2

Original line number	Diff line number	Diff line
		@@ -1258,7 +1258,15 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
		/* Ack/clear/reset pending uCode interrupts.
		* Note: Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,
		*/
		iwl_write32(priv, CSR_INT, priv->inta);
		/* There is a hardware bug in the interrupt mask function that some
		* interrupts (i.e. CSR_INT_BIT_SCD) can still be generated even if
		* they are disabled in the CSR_INT_MASK register. Furthermore the
		* ICT interrupt handling mechanism has another bug that might cause
		* these unmasked interrupts fail to be detected. We workaround the
		* hardware bugs here by ACKing all the possible interrupts so that
		* interrupt coalescing can still be achieved.
		*/
		iwl_write32(priv, CSR_INT, priv->inta \| ~priv->inta_mask);

		inta = priv->inta;

		@@ -2644,7 +2652,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv)
		BIT(NL80211_IFTYPE_STATION) \|
		BIT(NL80211_IFTYPE_ADHOC);

		hw->wiphy->flags \|= WIPHY_FLAG_STRICT_REGULATORY \|
		hw->wiphy->flags \|= WIPHY_FLAG_CUSTOM_REGULATORY \|
		WIPHY_FLAG_DISABLE_BEACON_HINTS;

		/*

+2 −2

Original line number	Diff line number	Diff line
		@@ -1955,7 +1955,7 @@ static void iwl3945_init_hw_rates(struct iwl_priv *priv,
		{
		int i;

		for (i = 0; i < IWL_RATE_COUNT; i++) {
		for (i = 0; i < IWL_RATE_COUNT_LEGACY; i++) {
		rates[i].bitrate = iwl3945_rates[i].ieee * 5;
		rates[i].hw_value = i; /* Rate scaling will work on indexes */
		rates[i].hw_value_short = i;
		@@ -3921,7 +3921,7 @@ static int iwl3945_setup_mac(struct iwl_priv *priv)
		BIT(NL80211_IFTYPE_STATION) \|
		BIT(NL80211_IFTYPE_ADHOC);

		hw->wiphy->flags \|= WIPHY_FLAG_STRICT_REGULATORY \|
		hw->wiphy->flags \|= WIPHY_FLAG_CUSTOM_REGULATORY \|
		WIPHY_FLAG_DISABLE_BEACON_HINTS;

		hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;

+6 −2

Original line number	Diff line number	Diff line
		@@ -172,6 +172,8 @@ int lbs_cfg_register(struct lbs_private *priv)
		if (ret < 0)
		lbs_pr_err("cannot register wiphy device\n");

		priv->wiphy_registered = true;

		ret = register_netdev(priv->dev);
		if (ret)
		lbs_pr_err("cannot register network device\n");
		@@ -190,9 +192,11 @@ void lbs_cfg_free(struct lbs_private *priv)
		if (!wdev)
		return;

		if (wdev->wiphy) {
		if (priv->wiphy_registered)
		wiphy_unregister(wdev->wiphy);

		if (wdev->wiphy)
		wiphy_free(wdev->wiphy);
		}

		kfree(wdev);
		}