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

Commit 92629195 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 a91e7d47 e7ee762c

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

+1 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	clear_bit(STATUS_SCAN_HW, &priv->status);

	clear_bit(STATUS_SCANNING, &priv->status);

	/* inform mac80211 scan aborted */

	queue_work(priv->workqueue, &priv->scan_completed);

	queue_work(priv->workqueue, &priv->abort_scan);

}



int iwlagn_manage_ibss_station(struct iwl_priv *priv,

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

+1 −1
Original line number Diff line number Diff line
@@ -3018,7 +3018,7 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	clear_bit(STATUS_SCANNING, &priv->status);



	/* inform mac80211 scan aborted */

	queue_work(priv->workqueue, &priv->scan_completed);

	queue_work(priv->workqueue, &priv->abort_scan);

}



static void iwl3945_bg_restart(struct work_struct *data)

net/mac80211/rx.c

+0 −4
Original line number Diff line number Diff line
@@ -2199,9 +2199,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, 
	struct net_device *prev_dev = NULL;

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);



	if (status->flag & RX_FLAG_INTERNAL_CMTR)

		goto out_free_skb;



	if (skb_headroom(skb) < sizeof(*rthdr) &&

	    pskb_expand_head(skb, sizeof(*rthdr), 0, GFP_ATOMIC))

		goto out_free_skb;
@@ -2260,7 +2257,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, 
	} else

		goto out_free_skb;



	status->flag |= RX_FLAG_INTERNAL_CMTR;

	return;



 out_free_skb: