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

Commit f403ede7 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 5dc474d6 a4278e18

drivers/net/ps3_gelic_wireless.c

+2 −0
Original line number Diff line number Diff line
@@ -2474,6 +2474,8 @@ static void gelic_wl_free(struct gelic_wl_info *wl) 


	pr_debug("%s: <-\n", __func__);



	free_page((unsigned long)wl->buf);



	pr_debug("%s: destroy queues\n", __func__);

	destroy_workqueue(wl->eurus_cmd_queue);

	destroy_workqueue(wl->event_queue);

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

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv, 
	rx_status.flag = 0;

	rx_status.mactime = le64_to_cpu(rx_end->timestamp);

	rx_status.freq =

		ieee80211_frequency_to_channel(le16_to_cpu(rx_hdr->channel));

		ieee80211_channel_to_frequency(le16_to_cpu(rx_hdr->channel));

	rx_status.band = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?

				IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;

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

+1 −1
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ struct iwl4965_lq_sta { 
	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;

#endif

	struct iwl4965_rate dbg_fixed;

	struct iwl_priv *drv;

#endif

	struct iwl_priv *drv;

};



static void rs_rate_scale_perform(struct iwl_priv *priv,

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

+1 −1
Original line number Diff line number Diff line
@@ -3978,7 +3978,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, 


	rx_status.mactime = le64_to_cpu(rx_start->timestamp);

	rx_status.freq =

		ieee80211_frequency_to_channel(le16_to_cpu(rx_start->channel));

		ieee80211_channel_to_frequency(le16_to_cpu(rx_start->channel));

	rx_status.band = (rx_start->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?

				IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;

	rx_status.rate_idx =

drivers/net/wireless/prism54/islpci_dev.c

+9 −2
Original line number Diff line number Diff line
@@ -388,8 +388,15 @@ islpci_open(struct net_device *ndev) 


	netif_start_queue(ndev);



	/* Turn off carrier unless we know we have associated */

	/* Turn off carrier if in STA or Ad-hoc mode. It will be turned on

	 * once the firmware receives a trap of being associated

	 * (GEN_OID_LINKSTATE). In other modes (AP or WDS or monitor) we

	 * should just leave the carrier on as its expected the firmware

	 * won't send us a trigger. */

	if (priv->iw_mode == IW_MODE_INFRA || priv->iw_mode == IW_MODE_ADHOC)

		netif_carrier_off(ndev);

	else

		netif_carrier_on(ndev);



	return 0;

}