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

Commit ab55570d authored by David S. Miller's avatar David S. Miller
Browse files

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

parents eef9d90d 8713a7cc

drivers/net/wireless/ath9k/main.c

+7 −1
Original line number Diff line number Diff line
@@ -1640,6 +1640,11 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, 
	return ret;

}



static int ath9k_no_fragmentation(struct ieee80211_hw *hw, u32 value)

{

	return -EOPNOTSUPP;

}



static struct ieee80211_ops ath9k_ops = {

	.tx 		    = ath9k_tx,

	.start 		    = ath9k_start,
@@ -1664,7 +1669,8 @@ static struct ieee80211_ops ath9k_ops = { 
	.get_tsf 	    = ath9k_get_tsf,

	.reset_tsf 	    = ath9k_reset_tsf,

	.tx_last_beacon     = NULL,

	.ampdu_action       = ath9k_ampdu_action

	.ampdu_action       = ath9k_ampdu_action,

	.set_frag_threshold = ath9k_no_fragmentation,

};



static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

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

+3 −3
Original line number Diff line number Diff line
@@ -833,12 +833,12 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
	switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) {

	case CSR_HW_REV_TYPE_5100:

	case CSR_HW_REV_TYPE_5300:

		/* 5X00 wants in Celsius */

	case CSR_HW_REV_TYPE_5350:

		/* 5X00 and 5350 wants in Celsius */

		priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;

		break;

	case CSR_HW_REV_TYPE_5150:

	case CSR_HW_REV_TYPE_5350:

		/* 5X50 wants in Kelvin */

		/* 5150 wants in Kelvin */

		priv->hw_params.ct_kill_threshold =

				CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD);

		break;

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -2422,7 +2422,7 @@ static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta, 
			void *priv_sta)

{

	struct iwl_lq_sta *lq_sta = priv_sta;

	struct iwl_priv *priv = priv_r;

	struct iwl_priv *priv __maybe_unused = priv_r;



	IWL_DEBUG_RATE("enter\n");

	kfree(lq_sta);

drivers/net/wireless/libertas/cmd.c

+2 −0
Original line number Diff line number Diff line
@@ -823,7 +823,9 @@ int lbs_update_channel(struct lbs_private *priv) 
int lbs_set_channel(struct lbs_private *priv, u8 channel)

{

	struct cmd_ds_802_11_rf_channel cmd;

#ifdef DEBUG

	u8 old_channel = priv->curbssparams.channel;

#endif

	int ret = 0;



	lbs_deb_enter(LBS_DEB_CMD);

drivers/net/wireless/orinoco_cs.c

+3 −2
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link) 
	struct orinoco_private *priv = netdev_priv(dev);

	struct orinoco_pccard *card = priv->card;

	int err = 0;

	unsigned long flags;



	if (! test_bit(0, &card->hard_reset_in_progress)) {

		err = orinoco_reinit_firmware(dev);
@@ -412,7 +413,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link) 
			return -EIO;

		}



		spin_lock(&priv->lock);

		spin_lock_irqsave(&priv->lock, flags);



		netif_device_attach(dev);

		priv->hw_unavailable--;
@@ -424,7 +425,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link) 
				       dev->name, err);

		}



		spin_unlock(&priv->lock);

		spin_unlock_irqrestore(&priv->lock, flags);

	}



	return err;