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

Commit 417c5233 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 91cd1756 c49de94a

drivers/net/wireless/b43/xmit.c

+3 −0
Original line number Diff line number Diff line
@@ -690,7 +690,10 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) 
	}



	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));



	local_bh_disable();

	ieee80211_rx(dev->wl->hw, skb);

	local_bh_enable();



#if B43_DEBUG

	dev->rx_count++;

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

+1 −1
Original line number Diff line number Diff line
@@ -3105,8 +3105,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
 out_pci_disable_device:

	pci_disable_device(pdev);

 out_ieee80211_free_hw:

	ieee80211_free_hw(priv->hw);

	iwl_free_traffic_mem(priv);

	ieee80211_free_hw(priv->hw);

 out:

	return err;

}

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −1
Original line number Diff line number Diff line
@@ -4096,8 +4096,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
	pci_set_drvdata(pdev, NULL);

	pci_disable_device(pdev);

 out_ieee80211_free_hw:

	ieee80211_free_hw(priv->hw);

	iwl_free_traffic_mem(priv);

	ieee80211_free_hw(priv->hw);

 out:

	return err;

}

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,8 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw); 
 * to this function and ieee80211_rx_irqsafe() may not be mixed for a

 * single hardware.

 *

 * Note that right now, this function must be called with softirqs disabled.

 *

 * @hw: the hardware this frame came in on

 * @skb: the buffer to receive, owned by mac80211 after this call

 */

net/mac80211/ibss.c

+2 −2
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) 
		       "%pM\n", bss->cbss.bssid, ifibss->bssid);

#endif /* CONFIG_MAC80211_IBSS_DEBUG */



	if (bss && memcmp(ifibss->bssid, bss->cbss.bssid, ETH_ALEN)) {

	if (bss && !memcmp(ifibss->bssid, bss->cbss.bssid, ETH_ALEN)) {

		printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM"

		       " based on configured SSID\n",

		       sdata->dev->name, bss->cbss.bssid);
@@ -829,7 +829,7 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local) 
		if (!sdata->u.ibss.ssid_len)

			continue;

		sdata->u.ibss.last_scan_completed = jiffies;

		ieee80211_sta_find_ibss(sdata);

		mod_timer(&sdata->u.ibss.timer, 0);

	}

	mutex_unlock(&local->iflist_mtx);

}