mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 15:34:48 +08:00
Merge branch 'mac80211' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
This commit is contained in:
commit
1acf6ba085
@ -2474,6 +2474,8 @@ static int ieee80211_open(struct net_device *dev)
|
||||
if (sdata->type == IEEE80211_IF_TYPE_STA &&
|
||||
!local->user_space_mlme)
|
||||
netif_carrier_off(dev);
|
||||
else
|
||||
netif_carrier_on(dev);
|
||||
|
||||
netif_start_queue(dev);
|
||||
return 0;
|
||||
@ -3278,8 +3280,10 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
|
||||
return TXRX_DROP;
|
||||
}
|
||||
}
|
||||
while ((skb = __skb_dequeue(&entry->skb_list)))
|
||||
while ((skb = __skb_dequeue(&entry->skb_list))) {
|
||||
memcpy(skb_put(rx->skb, skb->len), skb->data, skb->len);
|
||||
dev_kfree_skb(skb);
|
||||
}
|
||||
|
||||
/* Complete frame has been reassembled - process it now */
|
||||
rx->fragmented = 1;
|
||||
|
@ -1155,6 +1155,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
|
||||
if (status_code != WLAN_STATUS_SUCCESS) {
|
||||
printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",
|
||||
dev->name, status_code);
|
||||
if (status_code == WLAN_STATUS_REASSOC_NO_ASSOC)
|
||||
ifsta->prev_bssid_set = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -2995,7 +2997,7 @@ struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
|
||||
{
|
||||
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
|
||||
struct sta_info *sta;
|
||||
struct ieee80211_sub_if_data *sdata = NULL;
|
||||
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
||||
|
||||
/* TODO: Could consider removing the least recently used entry and
|
||||
* allow new one to be added. */
|
||||
|
Loading…
Reference in New Issue
Block a user