Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
This commit is contained in:
commit
0f74d82d80
|
@ -357,21 +357,27 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x5012, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x500A, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},
|
||||||
|
{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)},
|
{IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},
|
{IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)},
|
||||||
|
{IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)},
|
||||||
|
{IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)},
|
||||||
|
{IWL_PCI_DEVICE(0x095A, 0x9310, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)},
|
||||||
|
{IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)},
|
||||||
|
{IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)},
|
||||||
{IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)},
|
{IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)},
|
||||||
#endif /* CONFIG_IWLMVM */
|
#endif /* CONFIG_IWLMVM */
|
||||||
|
|
|
@ -2011,7 +2011,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
|
||||||
(hwsim_flags & HWSIM_TX_STAT_ACK)) {
|
(hwsim_flags & HWSIM_TX_STAT_ACK)) {
|
||||||
if (skb->len >= 16) {
|
if (skb->len >= 16) {
|
||||||
hdr = (struct ieee80211_hdr *) skb->data;
|
hdr = (struct ieee80211_hdr *) skb->data;
|
||||||
mac80211_hwsim_monitor_ack(txi->rate_driver_data[0],
|
mac80211_hwsim_monitor_ack(data2->channel,
|
||||||
hdr->addr2);
|
hdr->addr2);
|
||||||
}
|
}
|
||||||
txi->flags |= IEEE80211_TX_STAT_ACK;
|
txi->flags |= IEEE80211_TX_STAT_ACK;
|
||||||
|
|
|
@ -463,7 +463,6 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
|
||||||
{
|
{
|
||||||
struct sta_info *sta = tx->sta;
|
struct sta_info *sta = tx->sta;
|
||||||
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
|
||||||
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
|
|
||||||
struct ieee80211_local *local = tx->local;
|
struct ieee80211_local *local = tx->local;
|
||||||
|
|
||||||
if (unlikely(!sta))
|
if (unlikely(!sta))
|
||||||
|
@ -474,15 +473,6 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
|
||||||
!(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
|
!(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
|
||||||
int ac = skb_get_queue_mapping(tx->skb);
|
int ac = skb_get_queue_mapping(tx->skb);
|
||||||
|
|
||||||
/* only deauth, disassoc and action are bufferable MMPDUs */
|
|
||||||
if (ieee80211_is_mgmt(hdr->frame_control) &&
|
|
||||||
!ieee80211_is_deauth(hdr->frame_control) &&
|
|
||||||
!ieee80211_is_disassoc(hdr->frame_control) &&
|
|
||||||
!ieee80211_is_action(hdr->frame_control)) {
|
|
||||||
info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
|
|
||||||
return TX_CONTINUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",
|
ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",
|
||||||
sta->sta.addr, sta->sta.aid, ac);
|
sta->sta.addr, sta->sta.aid, ac);
|
||||||
if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
|
if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
|
||||||
|
@ -525,9 +515,22 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
|
||||||
static ieee80211_tx_result debug_noinline
|
static ieee80211_tx_result debug_noinline
|
||||||
ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)
|
ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)
|
||||||
{
|
{
|
||||||
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
|
||||||
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
|
||||||
|
|
||||||
if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))
|
if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))
|
||||||
return TX_CONTINUE;
|
return TX_CONTINUE;
|
||||||
|
|
||||||
|
/* only deauth, disassoc and action are bufferable MMPDUs */
|
||||||
|
if (ieee80211_is_mgmt(hdr->frame_control) &&
|
||||||
|
!ieee80211_is_deauth(hdr->frame_control) &&
|
||||||
|
!ieee80211_is_disassoc(hdr->frame_control) &&
|
||||||
|
!ieee80211_is_action(hdr->frame_control)) {
|
||||||
|
if (tx->flags & IEEE80211_TX_UNICAST)
|
||||||
|
info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
|
||||||
|
return TX_CONTINUE;
|
||||||
|
}
|
||||||
|
|
||||||
if (tx->flags & IEEE80211_TX_UNICAST)
|
if (tx->flags & IEEE80211_TX_UNICAST)
|
||||||
return ieee80211_tx_h_unicast_ps_buf(tx);
|
return ieee80211_tx_h_unicast_ps_buf(tx);
|
||||||
else
|
else
|
||||||
|
|
|
@ -384,7 +384,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
|
||||||
{
|
{
|
||||||
dev->dep_link_up = true;
|
dev->dep_link_up = true;
|
||||||
|
|
||||||
if (!dev->active_target) {
|
if (!dev->active_target && rf_mode == NFC_RF_INITIATOR) {
|
||||||
struct nfc_target *target;
|
struct nfc_target *target;
|
||||||
|
|
||||||
target = nfc_find_target(dev, target_idx);
|
target = nfc_find_target(dev, target_idx);
|
||||||
|
|
Loading…
Reference in New Issue