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

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

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

parents 16f3051b b9bf1e60

net/mac80211/ieee80211.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -4678,7 +4678,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, 
			memset(skb->cb, 0, sizeof(skb->cb));

			memset(skb->cb, 0, sizeof(skb->cb));

			netif_rx(skb);

			netif_rx(skb);

			skb = skb2;

			skb = skb2;

			break;

		}

		}

	}

	}

 out:

 out:

net/mac80211/ieee80211_sta.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -2154,7 +2154,11 @@ static int ieee80211_sta_config_auth(struct net_device *dev, 
		return 0;

		return 0;

	} else {

	} else {

		if (ifsta->state != IEEE80211_AUTHENTICATE) {

		if (ifsta->state != IEEE80211_AUTHENTICATE) {

			if (ifsta->auto_ssid_sel)

				ieee80211_sta_start_scan(dev, NULL, 0);

				ieee80211_sta_start_scan(dev, NULL, 0);

			else

				ieee80211_sta_start_scan(dev, ifsta->ssid,

							 ifsta->ssid_len);

			ifsta->state = IEEE80211_AUTHENTICATE;

			ifsta->state = IEEE80211_AUTHENTICATE;

			set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);

			set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);

		} else

		} else