Commit c1109736 authored by John W. Linville's avatar John W. Linville

Merge branch 'master' of...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents bb3bb3a5 b48d9665
...@@ -3405,7 +3405,7 @@ il4965_remove_dynamic_key(struct il_priv *il, ...@@ -3405,7 +3405,7 @@ il4965_remove_dynamic_key(struct il_priv *il,
return 0; return 0;
} }
if (il->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET) { if (il->stations[sta_id].sta.key.key_flags & STA_KEY_FLG_INVALID) {
IL_WARN("Removing wrong key %d 0x%x\n", keyconf->keyidx, IL_WARN("Removing wrong key %d 0x%x\n", keyconf->keyidx,
key_flags); key_flags);
spin_unlock_irqrestore(&il->sta_lock, flags); spin_unlock_irqrestore(&il->sta_lock, flags);
...@@ -3420,7 +3420,7 @@ il4965_remove_dynamic_key(struct il_priv *il, ...@@ -3420,7 +3420,7 @@ il4965_remove_dynamic_key(struct il_priv *il,
memset(&il->stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo)); memset(&il->stations[sta_id].sta.key, 0, sizeof(struct il4965_keyinfo));
il->stations[sta_id].sta.key.key_flags = il->stations[sta_id].sta.key.key_flags =
STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID; STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;
il->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET; il->stations[sta_id].sta.key.key_offset = keyconf->hw_key_idx;
il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK; il->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
......
...@@ -4767,7 +4767,6 @@ il_bg_watchdog(unsigned long data) ...@@ -4767,7 +4767,6 @@ il_bg_watchdog(unsigned long data)
return; return;
/* monitor and check for other stuck queues */ /* monitor and check for other stuck queues */
if (il_is_any_associated(il)) {
for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) { for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
/* skip as we already checked the command queue */ /* skip as we already checked the command queue */
if (cnt == il->cmd_queue) if (cnt == il->cmd_queue)
...@@ -4775,7 +4774,6 @@ il_bg_watchdog(unsigned long data) ...@@ -4775,7 +4774,6 @@ il_bg_watchdog(unsigned long data)
if (il_check_stuck_queue(il, cnt)) if (il_check_stuck_queue(il, cnt))
return; return;
} }
}
mod_timer(&il->watchdog, mod_timer(&il->watchdog,
jiffies + msecs_to_jiffies(IL_WD_TICK(timeout))); jiffies + msecs_to_jiffies(IL_WD_TICK(timeout)));
......
...@@ -958,6 +958,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, ...@@ -958,6 +958,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
case NL80211_HIDDEN_SSID_ZERO_CONTENTS: case NL80211_HIDDEN_SSID_ZERO_CONTENTS:
/* firmware doesn't support this type of hidden SSID */ /* firmware doesn't support this type of hidden SSID */
default: default:
kfree(bss_cfg);
return -EINVAL; return -EINVAL;
} }
......
...@@ -436,8 +436,8 @@ void rt2x00usb_kick_queue(struct data_queue *queue) ...@@ -436,8 +436,8 @@ void rt2x00usb_kick_queue(struct data_queue *queue)
case QID_RX: case QID_RX:
if (!rt2x00queue_full(queue)) if (!rt2x00queue_full(queue))
rt2x00queue_for_each_entry(queue, rt2x00queue_for_each_entry(queue,
Q_INDEX_DONE,
Q_INDEX, Q_INDEX,
Q_INDEX_DONE,
NULL, NULL,
rt2x00usb_kick_rx_entry); rt2x00usb_kick_rx_entry);
break; break;
......
...@@ -2174,15 +2174,13 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2174,15 +2174,13 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
sdata->name, mgmt->sa, status_code); sdata->name, mgmt->sa, status_code);
ieee80211_destroy_assoc_data(sdata, false); ieee80211_destroy_assoc_data(sdata, false);
} else { } else {
printk(KERN_DEBUG "%s: associated\n", sdata->name);
if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) { if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
/* oops -- internal error -- send timeout for now */ /* oops -- internal error -- send timeout for now */
ieee80211_destroy_assoc_data(sdata, true); ieee80211_destroy_assoc_data(sdata, false);
sta_info_destroy_addr(sdata, mgmt->bssid);
cfg80211_put_bss(*bss); cfg80211_put_bss(*bss);
return RX_MGMT_CFG80211_ASSOC_TIMEOUT; return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
} }
printk(KERN_DEBUG "%s: associated\n", sdata->name);
/* /*
* destroy assoc_data afterwards, as otherwise an idle * destroy assoc_data afterwards, as otherwise an idle
......
...@@ -809,7 +809,7 @@ minstrel_ht_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp) ...@@ -809,7 +809,7 @@ minstrel_ht_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp)
max_rates = sband->n_bitrates; max_rates = sband->n_bitrates;
} }
msp = kzalloc(sizeof(struct minstrel_ht_sta), gfp); msp = kzalloc(sizeof(*msp), gfp);
if (!msp) if (!msp)
return NULL; return NULL;
......
...@@ -292,7 +292,7 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *addr, ...@@ -292,7 +292,7 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *addr,
pr_debug("%p\n", sk); pr_debug("%p\n", sk);
if (llcp_sock == NULL) if (llcp_sock == NULL || llcp_sock->dev == NULL)
return -EBADFD; return -EBADFD;
addr->sa_family = AF_NFC; addr->sa_family = AF_NFC;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment