diff --git a/[refs] b/[refs] index 2ef552213447..da56b588f6e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fa7425c6394117a541de82826d128d6c3d9161b +refs/heads/master: b2898a27809f54a33050a70d0eaa4a78194163a0 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 4a3bddd206d8..86abdf96390c 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -2481,6 +2481,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev, control->flags |= IEEE80211_TX_CTL_SHORT_PREAMBLE; control->antenna_sel_tx = local->hw.conf.antenna_sel_tx; control->flags |= IEEE80211_TX_CTL_NO_ACK; + control->flags |= IEEE80211_TX_CTL_DO_NOT_ENCRYPT; control->control.retry_limit = 1; ifsta->probe_resp = skb_copy(skb, GFP_ATOMIC);