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

Commit 268bae0b authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
parents d70e9693 6a017e04

drivers/net/wireless/adm8211.c

+4 −4
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int adm8211_rf_set_channel(struct ieee80211_hw *dev, unsigned int chan) 


	/* Nothing to do for ADMtek BBP */

	} else if (priv->bbp_type != ADM8211_TYPE_ADMTEK)

		wiphy_debug(dev->wiphy, "unsupported bbp type %d\n",

		wiphy_debug(dev->wiphy, "unsupported BBP type %d\n",

			    priv->bbp_type);



	ADM8211_RESTORE();
@@ -1032,7 +1032,7 @@ static int adm8211_hw_init_bbp(struct ieee80211_hw *dev) 
			break;

		}

	} else

		wiphy_debug(dev->wiphy, "unsupported bbp %d\n", priv->bbp_type);

		wiphy_debug(dev->wiphy, "unsupported BBP %d\n", priv->bbp_type);



	ADM8211_CSR_WRITE(SYNRF, 0);
@@ -1525,7 +1525,7 @@ static int adm8211_start(struct ieee80211_hw *dev) 
	retval = request_irq(priv->pdev->irq, adm8211_interrupt,

			     IRQF_SHARED, "adm8211", dev);

	if (retval) {

		wiphy_err(dev->wiphy, "failed to register irq handler\n");

		wiphy_err(dev->wiphy, "failed to register IRQ handler\n");

		goto fail;

	}
@@ -1902,7 +1902,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, 
		goto err_free_eeprom;

	}



	wiphy_info(dev->wiphy, "hwaddr %pm, rev 0x%02x\n",

	wiphy_info(dev->wiphy, "hwaddr %pM, Rev 0x%02x\n",

		   dev->wiphy->perm_addr, pdev->revision);



	return 0;

drivers/net/wireless/at76c50x-usb.c

+11 −11
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static int at76_get_hw_config(struct at76_priv *priv) 
exit:

	kfree(hwcfg);

	if (ret < 0)

		wiphy_err(priv->hw->wiphy, "cannot get hw config (error %d)\n",

		wiphy_err(priv->hw->wiphy, "cannot get HW Config (error %d)\n",

			  ret);



	return ret;
@@ -960,7 +960,7 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv) 
			   sizeof(struct mib_mac_addr));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac_addr) failed: %d\n", ret);

			  "at76_get_mib (MAC_ADDR) failed: %d\n", ret);

		goto exit;

	}
@@ -989,7 +989,7 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv) 
			   sizeof(struct mib_mac_wep));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac_wep) failed: %d\n", ret);

			  "at76_get_mib (MAC_WEP) failed: %d\n", ret);

		goto exit;

	}
@@ -1026,7 +1026,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) 
			   sizeof(struct mib_mac_mgmt));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac_mgmt) failed: %d\n", ret);

			  "at76_get_mib (MAC_MGMT) failed: %d\n", ret);

		goto exit;

	}
@@ -1062,7 +1062,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv) 
	ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mac) failed: %d\n", ret);

			  "at76_get_mib (MAC) failed: %d\n", ret);

		goto exit;

	}
@@ -1099,7 +1099,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv) 
	ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (phy) failed: %d\n", ret);

			  "at76_get_mib (PHY) failed: %d\n", ret);

		goto exit;

	}
@@ -1132,7 +1132,7 @@ static void at76_dump_mib_local(struct at76_priv *priv) 
	ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (local) failed: %d\n", ret);

			  "at76_get_mib (LOCAL) failed: %d\n", ret);

		goto exit;

	}
@@ -1158,7 +1158,7 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv) 
			   sizeof(struct mib_mdomain));

	if (ret < 0) {

		wiphy_err(priv->hw->wiphy,

			  "at76_get_mib (mdomain) failed: %d\n", ret);

			  "at76_get_mib (MDOMAIN) failed: %d\n", ret);

		goto exit;

	}
@@ -1229,7 +1229,7 @@ static int at76_submit_rx_urb(struct at76_priv *priv) 
	struct sk_buff *skb = priv->rx_skb;



	if (!priv->rx_urb) {

		wiphy_err(priv->hw->wiphy, "%s: priv->rx_urb is null\n",

		wiphy_err(priv->hw->wiphy, "%s: priv->rx_urb is NULL\n",

			  __func__);

		return -EFAULT;

	}
@@ -1792,7 +1792,7 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		wiphy_err(priv->hw->wiphy, "error in tx submit urb: %d\n", ret);

		if (ret == -EINVAL)

			wiphy_err(priv->hw->wiphy,

				  "-einval: tx urb %p hcpriv %p complete %p\n",

				  "-EINVAL: tx urb %p hcpriv %p complete %p\n",

				  priv->tx_urb,

				  priv->tx_urb->hcpriv, priv->tx_urb->complete);

	}
@@ -2311,7 +2311,7 @@ static int at76_init_new_device(struct at76_priv *priv, 


	priv->mac80211_registered = 1;



	wiphy_info(priv->hw->wiphy, "usb %s, mac %pm, firmware %d.%d.%d-%d\n",

	wiphy_info(priv->hw->wiphy, "USB %s, MAC %pM, firmware %d.%d.%d-%d\n",

		   dev_name(&interface->dev), priv->mac_addr,

		   priv->fw_version.major, priv->fw_version.minor,

		   priv->fw_version.patch, priv->fw_version.build);

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

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void __ar9170_dump_txstats(struct ar9170 *ar) 
{

	int i;



	wiphy_debug(ar->hw->wiphy, "qos queue stats\n");

	wiphy_debug(ar->hw->wiphy, "QoS queue stats\n");



	for (i = 0; i < __AR9170_NUM_TXQ; i++)

		wiphy_debug(ar->hw->wiphy,
@@ -387,7 +387,7 @@ static struct sk_buff *ar9170_get_queued_skb(struct ar9170 *ar, 
		if (mac && compare_ether_addr(ieee80211_get_DA(hdr), mac)) {

#ifdef AR9170_QUEUE_DEBUG

			wiphy_debug(ar->hw->wiphy,

				    "skip frame => da %pm != %pm\n",

				    "skip frame => DA %pM != %pM\n",

				    mac, ieee80211_get_DA(hdr));

			ar9170_print_txheader(ar, skb);

#endif /* AR9170_QUEUE_DEBUG */

drivers/net/wireless/ipw2x00/ipw2100.c

+0 −8
Original line number Diff line number Diff line
@@ -2723,14 +2723,6 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv) 


		packet = &priv->rx_buffers[i];



		/* Sync the DMA for the STATUS buffer so CPU is sure to get

		 * the correct values */

		pci_dma_sync_single_for_cpu(priv->pci_dev,

					    sq->nic +

					    sizeof(struct ipw2100_status) * i,

					    sizeof(struct ipw2100_status),

					    PCI_DMA_FROMDEVICE);



		/* Sync the DMA for the RX buffer so CPU is sure to get

		 * the correct values */

		pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr,

drivers/net/wireless/iwlwifi/iwl-1000.c

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,
@@ -302,7 +302,7 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,