mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: bnx2x: Accessing un-mapped page ath9k: Fix TX control flag use for no ACK and RTS/CTS ath9k: Fix TX status reporting iwlwifi: fix STATUS_EXIT_PENDING is not set on pci_remove iwlwifi: call apm stop on exit iwlwifi: fix Tx cmd memory allocation failure handling iwlwifi: fix rx_chain computation iwlwifi: fix station mimo power save values iwlwifi: remove false rxon if rx chain changes iwlwifi: fix hidden ssid discovery in passive channels iwlwifi: W/A for the TSF correction in IBSS netxen: Remove workaround for chipset quirk pcnet-cs, axnet_cs: add new IDs, remove dup ID with less info ixgbe: initialize interrupt throttle rate net/usb/pegasus: avoid hundreds of diagnostics tipc: Don't use structure names which easily globally conflict.
This commit is contained in:
Linus Torvalds
commit
316343e2cf
35 changed files with 248 additions and 213 deletions
|
|
@ -151,6 +151,8 @@ struct sw_rx_page {
|
|||
#define PAGES_PER_SGE_SHIFT 0
|
||||
#define PAGES_PER_SGE (1 << PAGES_PER_SGE_SHIFT)
|
||||
|
||||
#define BCM_RX_ETH_PAYLOAD_ALIGN 64
|
||||
|
||||
/* SGE ring related macros */
|
||||
#define NUM_RX_SGE_PAGES 2
|
||||
#define RX_SGE_CNT (BCM_PAGE_SIZE / sizeof(struct eth_rx_sge))
|
||||
|
|
@ -750,8 +752,7 @@ struct bnx2x {
|
|||
|
||||
u32 rx_csum;
|
||||
u32 rx_offset;
|
||||
u32 rx_buf_use_size; /* useable size */
|
||||
u32 rx_buf_size; /* with alignment */
|
||||
u32 rx_buf_size;
|
||||
#define ETH_OVREHEAD (ETH_HLEN + 8) /* 8 for CRC + VLAN */
|
||||
#define ETH_MIN_PACKET_SIZE 60
|
||||
#define ETH_MAX_PACKET_SIZE 1500
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@
|
|||
#include "bnx2x.h"
|
||||
#include "bnx2x_init.h"
|
||||
|
||||
#define DRV_MODULE_VERSION "1.45.20"
|
||||
#define DRV_MODULE_RELDATE "2008/08/25"
|
||||
#define DRV_MODULE_VERSION "1.45.21"
|
||||
#define DRV_MODULE_RELDATE "2008/09/03"
|
||||
#define BNX2X_BC_VER 0x040200
|
||||
|
||||
/* Time in jiffies before concluding the transmitter is hung */
|
||||
|
|
@ -1027,7 +1027,7 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
|
|||
if (unlikely(skb == NULL))
|
||||
return -ENOMEM;
|
||||
|
||||
mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_use_size,
|
||||
mapping = pci_map_single(bp->pdev, skb->data, bp->rx_buf_size,
|
||||
PCI_DMA_FROMDEVICE);
|
||||
if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
|
||||
dev_kfree_skb(skb);
|
||||
|
|
@ -1169,7 +1169,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
|
|||
/* move empty skb from pool to prod and map it */
|
||||
prod_rx_buf->skb = fp->tpa_pool[queue].skb;
|
||||
mapping = pci_map_single(bp->pdev, fp->tpa_pool[queue].skb->data,
|
||||
bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
|
||||
bp->rx_buf_size, PCI_DMA_FROMDEVICE);
|
||||
pci_unmap_addr_set(prod_rx_buf, mapping, mapping);
|
||||
|
||||
/* move partial skb from cons to pool (don't unmap yet) */
|
||||
|
|
@ -1276,7 +1276,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
|
|||
pool entry status to BNX2X_TPA_STOP even if new skb allocation
|
||||
fails. */
|
||||
pci_unmap_single(bp->pdev, pci_unmap_addr(rx_buf, mapping),
|
||||
bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
|
||||
bp->rx_buf_size, PCI_DMA_FROMDEVICE);
|
||||
|
||||
if (likely(new_skb)) {
|
||||
/* fix ip xsum and give it to the stack */
|
||||
|
|
@ -1520,7 +1520,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
|
|||
} else if (bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0) {
|
||||
pci_unmap_single(bp->pdev,
|
||||
pci_unmap_addr(rx_buf, mapping),
|
||||
bp->rx_buf_use_size,
|
||||
bp->rx_buf_size,
|
||||
PCI_DMA_FROMDEVICE);
|
||||
skb_reserve(skb, pad);
|
||||
skb_put(skb, len);
|
||||
|
|
@ -4229,7 +4229,7 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
|
|||
if (fp->tpa_state[i] == BNX2X_TPA_START)
|
||||
pci_unmap_single(bp->pdev,
|
||||
pci_unmap_addr(rx_buf, mapping),
|
||||
bp->rx_buf_use_size,
|
||||
bp->rx_buf_size,
|
||||
PCI_DMA_FROMDEVICE);
|
||||
|
||||
dev_kfree_skb(skb);
|
||||
|
|
@ -4245,15 +4245,14 @@ static void bnx2x_init_rx_rings(struct bnx2x *bp)
|
|||
u16 ring_prod, cqe_ring_prod;
|
||||
int i, j;
|
||||
|
||||
bp->rx_buf_use_size = bp->dev->mtu;
|
||||
bp->rx_buf_use_size += bp->rx_offset + ETH_OVREHEAD;
|
||||
bp->rx_buf_size = bp->rx_buf_use_size + 64;
|
||||
bp->rx_buf_size = bp->dev->mtu;
|
||||
bp->rx_buf_size += bp->rx_offset + ETH_OVREHEAD +
|
||||
BCM_RX_ETH_PAYLOAD_ALIGN;
|
||||
|
||||
if (bp->flags & TPA_ENABLE_FLAG) {
|
||||
DP(NETIF_MSG_IFUP,
|
||||
"rx_buf_use_size %d rx_buf_size %d effective_mtu %d\n",
|
||||
bp->rx_buf_use_size, bp->rx_buf_size,
|
||||
bp->dev->mtu + ETH_OVREHEAD);
|
||||
"rx_buf_size %d effective_mtu %d\n",
|
||||
bp->rx_buf_size, bp->dev->mtu + ETH_OVREHEAD);
|
||||
|
||||
for_each_queue(bp, j) {
|
||||
struct bnx2x_fastpath *fp = &bp->fp[j];
|
||||
|
|
@ -4462,9 +4461,10 @@ static void bnx2x_init_context(struct bnx2x *bp)
|
|||
context->ustorm_st_context.common.status_block_id = sb_id;
|
||||
context->ustorm_st_context.common.flags =
|
||||
USTORM_ETH_ST_CONTEXT_CONFIG_ENABLE_MC_ALIGNMENT;
|
||||
context->ustorm_st_context.common.mc_alignment_size = 64;
|
||||
context->ustorm_st_context.common.mc_alignment_size =
|
||||
BCM_RX_ETH_PAYLOAD_ALIGN;
|
||||
context->ustorm_st_context.common.bd_buff_size =
|
||||
bp->rx_buf_use_size;
|
||||
bp->rx_buf_size;
|
||||
context->ustorm_st_context.common.bd_page_base_hi =
|
||||
U64_HI(fp->rx_desc_mapping);
|
||||
context->ustorm_st_context.common.bd_page_base_lo =
|
||||
|
|
@ -4717,7 +4717,7 @@ static void bnx2x_init_internal_func(struct bnx2x *bp)
|
|||
}
|
||||
|
||||
/* Init CQ ring mapping and aggregation size */
|
||||
max_agg_size = min((u32)(bp->rx_buf_use_size +
|
||||
max_agg_size = min((u32)(bp->rx_buf_size +
|
||||
8*BCM_PAGE_SIZE*PAGES_PER_SGE),
|
||||
(u32)0xffff);
|
||||
for_each_queue(bp, i) {
|
||||
|
|
@ -5940,7 +5940,7 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)
|
|||
|
||||
pci_unmap_single(bp->pdev,
|
||||
pci_unmap_addr(rx_buf, mapping),
|
||||
bp->rx_buf_use_size,
|
||||
bp->rx_buf_size,
|
||||
PCI_DMA_FROMDEVICE);
|
||||
|
||||
rx_buf->skb = NULL;
|
||||
|
|
|
|||
|
|
@ -2303,6 +2303,12 @@ static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter
|
|||
int err = 0;
|
||||
int vector, v_budget;
|
||||
|
||||
/*
|
||||
* Set the default interrupt throttle rate.
|
||||
*/
|
||||
adapter->rx_eitr = (1000000 / IXGBE_DEFAULT_ITR_RX_USECS);
|
||||
adapter->tx_eitr = (1000000 / IXGBE_DEFAULT_ITR_TX_USECS);
|
||||
|
||||
/*
|
||||
* It's easy to be greedy for MSI-X vectors, but it really
|
||||
* doesn't do us much good if we have a lot more vectors
|
||||
|
|
|
|||
|
|
@ -359,16 +359,6 @@ static void netxen_pcie_strap_init(struct netxen_adapter *adapter)
|
|||
int i, pos;
|
||||
struct pci_dev *pdev;
|
||||
|
||||
pdev = pci_get_device(0x1166, 0x0140, NULL);
|
||||
if (pdev) {
|
||||
pci_dev_put(pdev);
|
||||
adapter->hw_read_wx(adapter,
|
||||
NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4);
|
||||
chicken |= 0x4000;
|
||||
adapter->hw_write_wx(adapter,
|
||||
NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4);
|
||||
}
|
||||
|
||||
pdev = adapter->pdev;
|
||||
|
||||
adapter->hw_read_wx(adapter,
|
||||
|
|
|
|||
|
|
@ -784,6 +784,7 @@ static struct pcmcia_device_id axnet_ids[] = {
|
|||
PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEther PCC-TXD", 0x5261440f, 0x436768c5),
|
||||
PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FEtherII PCC-TXD", 0x5261440f, 0x730df72e),
|
||||
PCMCIA_DEVICE_PROD_ID12("Dynalink", "L100C16", 0x55632fd5, 0x66bc2a90),
|
||||
PCMCIA_DEVICE_PROD_ID12("IO DATA", "ETXPCM", 0x547e66dc, 0x233adac2),
|
||||
PCMCIA_DEVICE_PROD_ID12("Linksys", "EtherFast 10/100 PC Card (PCMPC100 V3)", 0x0733cc81, 0x232019a8),
|
||||
PCMCIA_DEVICE_PROD_ID12("MELCO", "LPC3-TX", 0x481e0094, 0xf91af609),
|
||||
PCMCIA_DEVICE_PROD_ID12("PCMCIA", "100BASE", 0x281f1c5d, 0x7c2add04),
|
||||
|
|
|
|||
|
|
@ -1626,6 +1626,7 @@ static struct pcmcia_device_id pcnet_ids[] = {
|
|||
PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega EtherII PCC-TD", 0x5261440f, 0xc49bd73d),
|
||||
PCMCIA_DEVICE_PROD_ID12("Corega K.K.", "corega EtherII PCC-TD", 0xd4fdcbd8, 0xc49bd73d),
|
||||
PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-T", 0x5261440f, 0x6705fcaa),
|
||||
PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega Ether PCC-TD", 0x5261440f, 0x47d5ca83),
|
||||
PCMCIA_DEVICE_PROD_ID12("corega K.K.", "corega FastEther PCC-TX", 0x5261440f, 0x485e85d9),
|
||||
PCMCIA_DEVICE_PROD_ID12("Corega,K.K.", "Ethernet LAN Card", 0x110d26d9, 0x9fd2f0a2),
|
||||
PCMCIA_DEVICE_PROD_ID12("corega,K.K.", "Ethernet LAN Card", 0x9791a90e, 0x9fd2f0a2),
|
||||
|
|
@ -1737,7 +1738,6 @@ static struct pcmcia_device_id pcnet_ids[] = {
|
|||
PCMCIA_DEVICE_PROD_ID1("CyQ've 10 Base-T LAN CARD", 0x94faf360),
|
||||
PCMCIA_DEVICE_PROD_ID1("EP-210 PCMCIA LAN CARD.", 0x8850b4de),
|
||||
PCMCIA_DEVICE_PROD_ID1("ETHER-C16", 0x06a8514f),
|
||||
PCMCIA_DEVICE_PROD_ID1("IC-CARD", 0x60cb09a6),
|
||||
PCMCIA_DEVICE_PROD_ID1("NE2000 Compatible", 0x75b8ad5a),
|
||||
PCMCIA_DEVICE_PROD_ID2("EN-6200P2", 0xa996d078),
|
||||
/* too generic! */
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ static void ctrl_callback(struct urb *urb)
|
|||
case -ENOENT:
|
||||
break;
|
||||
default:
|
||||
if (netif_msg_drv(pegasus))
|
||||
if (netif_msg_drv(pegasus) && printk_ratelimit())
|
||||
dev_dbg(&pegasus->intf->dev, "%s, status %d\n",
|
||||
__FUNCTION__, urb->status);
|
||||
}
|
||||
|
|
@ -166,7 +166,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
|
|||
set_current_state(TASK_RUNNING);
|
||||
if (ret == -ENODEV)
|
||||
netif_device_detach(pegasus->net);
|
||||
if (netif_msg_drv(pegasus))
|
||||
if (netif_msg_drv(pegasus) && printk_ratelimit())
|
||||
dev_err(&pegasus->intf->dev, "%s, status %d\n",
|
||||
__FUNCTION__, ret);
|
||||
goto out;
|
||||
|
|
@ -275,7 +275,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data)
|
|||
if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {
|
||||
if (ret == -ENODEV)
|
||||
netif_device_detach(pegasus->net);
|
||||
if (netif_msg_drv(pegasus))
|
||||
if (netif_msg_drv(pegasus) && printk_ratelimit())
|
||||
dev_err(&pegasus->intf->dev, "%s, status %d\n",
|
||||
__FUNCTION__, ret);
|
||||
goto out;
|
||||
|
|
@ -1209,8 +1209,7 @@ static void pegasus_set_multicast(struct net_device *net)
|
|||
pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
|
||||
if (netif_msg_link(pegasus))
|
||||
pr_info("%s: Promiscuous mode enabled.\n", net->name);
|
||||
} else if (net->mc_count ||
|
||||
(net->flags & IFF_ALLMULTI)) {
|
||||
} else if (net->mc_count || (net->flags & IFF_ALLMULTI)) {
|
||||
pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;
|
||||
pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
|
||||
if (netif_msg_link(pegasus))
|
||||
|
|
@ -1220,6 +1219,8 @@ static void pegasus_set_multicast(struct net_device *net)
|
|||
pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
|
||||
}
|
||||
|
||||
pegasus->ctrl_urb->status = 0;
|
||||
|
||||
pegasus->flags |= ETH_REGS_CHANGE;
|
||||
ctrl_callback(pegasus->ctrl_urb);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1067,8 +1067,16 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
|
|||
tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
|
||||
tx_status->flags &= ~ATH_TX_BAR;
|
||||
}
|
||||
if (tx_status->flags)
|
||||
tx_info->status.excessive_retries = 1;
|
||||
|
||||
if (tx_status->flags & (ATH_TX_ERROR | ATH_TX_XRETRY)) {
|
||||
if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) {
|
||||
/* Frame was not ACKed, but an ACK was expected */
|
||||
tx_info->status.excessive_retries = 1;
|
||||
}
|
||||
} else {
|
||||
/* Frame was ACKed */
|
||||
tx_info->flags |= IEEE80211_TX_STAT_ACK;
|
||||
}
|
||||
|
||||
tx_info->status.retry_count = tx_status->retries;
|
||||
|
||||
|
|
|
|||
|
|
@ -357,9 +357,9 @@ static int ath_tx_prepare(struct ath_softc *sc,
|
|||
txctl->flags = ATH9K_TXDESC_CLRDMASK; /* needed for crypto errors */
|
||||
|
||||
if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
|
||||
tx_info->flags |= ATH9K_TXDESC_NOACK;
|
||||
txctl->flags |= ATH9K_TXDESC_NOACK;
|
||||
if (tx_info->flags & IEEE80211_TX_CTL_USE_RTS_CTS)
|
||||
tx_info->flags |= ATH9K_TXDESC_RTSENA;
|
||||
txctl->flags |= ATH9K_TXDESC_RTSENA;
|
||||
|
||||
/*
|
||||
* Setup for rate calculations.
|
||||
|
|
|
|||
|
|
@ -1153,7 +1153,8 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
|
|||
!sta->ht_info.ht_supported)
|
||||
return -1;
|
||||
|
||||
if (priv->current_ht_config.tx_mimo_ps_mode == IWL_MIMO_PS_STATIC)
|
||||
if (((sta->ht_info.cap & IEEE80211_HT_CAP_MIMO_PS) >> 2)
|
||||
== IWL_MIMO_PS_STATIC)
|
||||
return -1;
|
||||
|
||||
/* Need both Tx chains/antennas to support MIMO */
|
||||
|
|
|
|||
|
|
@ -181,14 +181,14 @@ static int iwl4965_check_rxon_cmd(struct iwl_rxon_cmd *rxon)
|
|||
}
|
||||
|
||||
/**
|
||||
* iwl4965_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
|
||||
* iwl_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed
|
||||
* @priv: staging_rxon is compared to active_rxon
|
||||
*
|
||||
* If the RXON structure is changing enough to require a new tune,
|
||||
* or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
|
||||
* a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
|
||||
*/
|
||||
static int iwl4965_full_rxon_required(struct iwl_priv *priv)
|
||||
static int iwl_full_rxon_required(struct iwl_priv *priv)
|
||||
{
|
||||
|
||||
/* These items are only settable from the full RXON command */
|
||||
|
|
@ -207,7 +207,6 @@ static int iwl4965_full_rxon_required(struct iwl_priv *priv)
|
|||
priv->active_rxon.ofdm_ht_single_stream_basic_rates) ||
|
||||
(priv->staging_rxon.ofdm_ht_dual_stream_basic_rates !=
|
||||
priv->active_rxon.ofdm_ht_dual_stream_basic_rates) ||
|
||||
(priv->staging_rxon.rx_chain != priv->active_rxon.rx_chain) ||
|
||||
(priv->staging_rxon.assoc_id != priv->active_rxon.assoc_id))
|
||||
return 1;
|
||||
|
||||
|
|
@ -263,7 +262,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
|
|||
/* If we don't need to send a full RXON, we can use
|
||||
* iwl4965_rxon_assoc_cmd which is used to reconfigure filter
|
||||
* and other flags for the current radio configuration. */
|
||||
if (!iwl4965_full_rxon_required(priv)) {
|
||||
if (!iwl_full_rxon_required(priv)) {
|
||||
ret = iwl_send_rxon_assoc(priv);
|
||||
if (ret) {
|
||||
IWL_ERROR("Error setting RXON_ASSOC (%d)\n", ret);
|
||||
|
|
@ -587,8 +586,6 @@ static void iwl4965_ht_conf(struct iwl_priv *priv,
|
|||
iwl_conf->supported_chan_width = 0;
|
||||
}
|
||||
|
||||
iwl_conf->tx_mimo_ps_mode =
|
||||
(u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2);
|
||||
memcpy(iwl_conf->supp_mcs_set, ht_conf->supp_mcs_set, 16);
|
||||
|
||||
iwl_conf->control_channel = ht_bss_conf->primary_channel;
|
||||
|
|
@ -2190,7 +2187,10 @@ static void __iwl4965_down(struct iwl_priv *priv)
|
|||
udelay(5);
|
||||
|
||||
/* FIXME: apm_ops.suspend(priv) */
|
||||
priv->cfg->ops->lib->apm_ops.reset(priv);
|
||||
if (exit_pending || test_bit(STATUS_IN_SUSPEND, &priv->status))
|
||||
priv->cfg->ops->lib->apm_ops.stop(priv);
|
||||
else
|
||||
priv->cfg->ops->lib->apm_ops.reset(priv);
|
||||
priv->cfg->ops->lib->free_shared_mem(priv);
|
||||
|
||||
exit:
|
||||
|
|
@ -3588,7 +3588,7 @@ static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
|
|||
|
||||
priv->assoc_id = 0;
|
||||
timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
|
||||
priv->timestamp = le64_to_cpu(timestamp) + (priv->beacon_int * 1000);
|
||||
priv->timestamp = le64_to_cpu(timestamp);
|
||||
|
||||
IWL_DEBUG_MAC80211("leave\n");
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
|
@ -4372,15 +4372,18 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
|
|||
iwl_dbgfs_unregister(priv);
|
||||
sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group);
|
||||
|
||||
/* ieee80211_unregister_hw call wil cause iwl4965_mac_stop to
|
||||
* to be called and iwl4965_down since we are removing the device
|
||||
* we need to set STATUS_EXIT_PENDING bit.
|
||||
*/
|
||||
set_bit(STATUS_EXIT_PENDING, &priv->status);
|
||||
if (priv->mac80211_registered) {
|
||||
ieee80211_unregister_hw(priv->hw);
|
||||
priv->mac80211_registered = 0;
|
||||
} else {
|
||||
iwl4965_down(priv);
|
||||
}
|
||||
|
||||
set_bit(STATUS_EXIT_PENDING, &priv->status);
|
||||
|
||||
iwl4965_down(priv);
|
||||
|
||||
/* make sure we flush any pending irq or
|
||||
* tasklet for the driver
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -592,12 +592,11 @@ static void iwlcore_free_geos(struct iwl_priv *priv)
|
|||
clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
|
||||
}
|
||||
|
||||
static u8 is_single_rx_stream(struct iwl_priv *priv)
|
||||
static bool is_single_rx_stream(struct iwl_priv *priv)
|
||||
{
|
||||
return !priv->current_ht_config.is_ht ||
|
||||
((priv->current_ht_config.supp_mcs_set[1] == 0) &&
|
||||
(priv->current_ht_config.supp_mcs_set[2] == 0)) ||
|
||||
priv->ps_mode == IWL_MIMO_PS_STATIC;
|
||||
(priv->current_ht_config.supp_mcs_set[2] == 0));
|
||||
}
|
||||
|
||||
static u8 iwl_is_channel_extension(struct iwl_priv *priv,
|
||||
|
|
@ -704,33 +703,39 @@ EXPORT_SYMBOL(iwl_set_rxon_ht);
|
|||
* MIMO (dual stream) requires at least 2, but works better with 3.
|
||||
* This does not determine *which* chains to use, just how many.
|
||||
*/
|
||||
static int iwlcore_get_rx_chain_counter(struct iwl_priv *priv,
|
||||
u8 *idle_state, u8 *rx_state)
|
||||
static int iwl_get_active_rx_chain_count(struct iwl_priv *priv)
|
||||
{
|
||||
u8 is_single = is_single_rx_stream(priv);
|
||||
u8 is_cam = test_bit(STATUS_POWER_PMI, &priv->status) ? 0 : 1;
|
||||
bool is_single = is_single_rx_stream(priv);
|
||||
bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
|
||||
|
||||
/* # of Rx chains to use when expecting MIMO. */
|
||||
if (is_single || (!is_cam && (priv->ps_mode == IWL_MIMO_PS_STATIC)))
|
||||
*rx_state = 2;
|
||||
return 2;
|
||||
else
|
||||
*rx_state = 3;
|
||||
return 3;
|
||||
}
|
||||
|
||||
static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
|
||||
{
|
||||
int idle_cnt;
|
||||
bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
|
||||
/* # Rx chains when idling and maybe trying to save power */
|
||||
switch (priv->ps_mode) {
|
||||
case IWL_MIMO_PS_STATIC:
|
||||
case IWL_MIMO_PS_DYNAMIC:
|
||||
*idle_state = (is_cam) ? 2 : 1;
|
||||
idle_cnt = (is_cam) ? 2 : 1;
|
||||
break;
|
||||
case IWL_MIMO_PS_NONE:
|
||||
*idle_state = (is_cam) ? *rx_state : 1;
|
||||
idle_cnt = (is_cam) ? active_cnt : 1;
|
||||
break;
|
||||
case IWL_MIMO_PS_INVALID:
|
||||
default:
|
||||
*idle_state = 1;
|
||||
IWL_ERROR("invalide mimo ps mode %d\n", priv->ps_mode);
|
||||
WARN_ON(1);
|
||||
idle_cnt = -1;
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return idle_cnt;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -741,34 +746,44 @@ static int iwlcore_get_rx_chain_counter(struct iwl_priv *priv,
|
|||
*/
|
||||
void iwl_set_rxon_chain(struct iwl_priv *priv)
|
||||
{
|
||||
u8 is_single = is_single_rx_stream(priv);
|
||||
u8 idle_state, rx_state;
|
||||
|
||||
priv->staging_rxon.rx_chain = 0;
|
||||
rx_state = idle_state = 3;
|
||||
bool is_single = is_single_rx_stream(priv);
|
||||
bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status);
|
||||
u8 idle_rx_cnt, active_rx_cnt;
|
||||
u16 rx_chain;
|
||||
|
||||
/* Tell uCode which antennas are actually connected.
|
||||
* Before first association, we assume all antennas are connected.
|
||||
* Just after first association, iwl_chain_noise_calibration()
|
||||
* checks which antennas actually *are* connected. */
|
||||
priv->staging_rxon.rx_chain |=
|
||||
cpu_to_le16(priv->hw_params.valid_rx_ant <<
|
||||
RXON_RX_CHAIN_VALID_POS);
|
||||
rx_chain = priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
|
||||
|
||||
/* How many receivers should we use? */
|
||||
iwlcore_get_rx_chain_counter(priv, &idle_state, &rx_state);
|
||||
priv->staging_rxon.rx_chain |=
|
||||
cpu_to_le16(rx_state << RXON_RX_CHAIN_MIMO_CNT_POS);
|
||||
priv->staging_rxon.rx_chain |=
|
||||
cpu_to_le16(idle_state << RXON_RX_CHAIN_CNT_POS);
|
||||
active_rx_cnt = iwl_get_active_rx_chain_count(priv);
|
||||
idle_rx_cnt = iwl_get_idle_rx_chain_count(priv, active_rx_cnt);
|
||||
|
||||
if (!is_single && (rx_state >= 2) &&
|
||||
!test_bit(STATUS_POWER_PMI, &priv->status))
|
||||
/* correct rx chain count accoridng hw settings */
|
||||
if (priv->hw_params.rx_chains_num < active_rx_cnt)
|
||||
active_rx_cnt = priv->hw_params.rx_chains_num;
|
||||
|
||||
if (priv->hw_params.rx_chains_num < idle_rx_cnt)
|
||||
idle_rx_cnt = priv->hw_params.rx_chains_num;
|
||||
|
||||
rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS;
|
||||
rx_chain |= idle_rx_cnt << RXON_RX_CHAIN_CNT_POS;
|
||||
|
||||
priv->staging_rxon.rx_chain = cpu_to_le16(rx_chain);
|
||||
|
||||
if (!is_single && (active_rx_cnt >= 2) && is_cam)
|
||||
priv->staging_rxon.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;
|
||||
else
|
||||
priv->staging_rxon.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;
|
||||
|
||||
IWL_DEBUG_ASSOC("rx chain %X\n", priv->staging_rxon.rx_chain);
|
||||
IWL_DEBUG_ASSOC("rx_chain=0x%Xi active=%d idle=%d\n",
|
||||
priv->staging_rxon.rx_chain,
|
||||
active_rx_cnt, idle_rx_cnt);
|
||||
|
||||
WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||
|
||||
active_rx_cnt < idle_rx_cnt);
|
||||
}
|
||||
EXPORT_SYMBOL(iwl_set_rxon_chain);
|
||||
|
||||
|
|
|
|||
|
|
@ -412,7 +412,6 @@ struct iwl_ht_info {
|
|||
/* self configuration data */
|
||||
u8 is_ht;
|
||||
u8 supported_chan_width;
|
||||
u16 tx_mimo_ps_mode;
|
||||
u8 is_green_field;
|
||||
u8 sgf; /* HT_SHORT_GI_* short guard interval */
|
||||
u8 max_amsdu_size;
|
||||
|
|
|
|||
|
|
@ -1173,7 +1173,10 @@ void iwl_rx_reply_rx(struct iwl_priv *priv,
|
|||
|
||||
rx_status.antenna = 0;
|
||||
rx_status.flag = 0;
|
||||
rx_status.flag |= RX_FLAG_TSFT;
|
||||
|
||||
/* TSF isn't reliable. In order to allow smooth user experience,
|
||||
* this W/A doesn't propagate it to the mac80211 */
|
||||
/*rx_status.flag |= RX_FLAG_TSFT;*/
|
||||
|
||||
if ((unlikely(rx_start->cfg_phy_cnt > 20))) {
|
||||
IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n",
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
|
|||
else
|
||||
scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
|
||||
|
||||
if ((scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) && n_probes)
|
||||
if (n_probes)
|
||||
scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes);
|
||||
|
||||
scan_ch->active_dwell = cpu_to_le16(active_dwell);
|
||||
|
|
|
|||
|
|
@ -402,12 +402,11 @@ static int iwl_hw_tx_queue_init(struct iwl_priv *priv,
|
|||
/**
|
||||
* iwl_tx_queue_init - Allocate and initialize one tx/cmd queue
|
||||
*/
|
||||
static int iwl_tx_queue_init(struct iwl_priv *priv,
|
||||
struct iwl_tx_queue *txq,
|
||||
static int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
|
||||
int slots_num, u32 txq_id)
|
||||
{
|
||||
int i, len;
|
||||
int rc = 0;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* Alloc buffer array for commands (Tx or other types of commands).
|
||||
|
|
@ -428,17 +427,14 @@ static int iwl_tx_queue_init(struct iwl_priv *priv,
|
|||
|
||||
txq->cmd[i] = kmalloc(len, GFP_KERNEL);
|
||||
if (!txq->cmd[i])
|
||||
return -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Alloc driver data array and TFD circular buffer */
|
||||
rc = iwl_tx_queue_alloc(priv, txq, txq_id);
|
||||
if (rc) {
|
||||
for (i = 0; i < slots_num; i++)
|
||||
kfree(txq->cmd[i]);
|
||||
ret = iwl_tx_queue_alloc(priv, txq, txq_id);
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
return -ENOMEM;
|
||||
}
|
||||
txq->need_update = 0;
|
||||
|
||||
/* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
|
||||
|
|
@ -452,6 +448,17 @@ static int iwl_tx_queue_init(struct iwl_priv *priv,
|
|||
iwl_hw_tx_queue_init(priv, txq);
|
||||
|
||||
return 0;
|
||||
err:
|
||||
for (i = 0; i < slots_num; i++) {
|
||||
kfree(txq->cmd[i]);
|
||||
txq->cmd[i] = NULL;
|
||||
}
|
||||
|
||||
if (txq_id == IWL_CMD_QUEUE_NUM) {
|
||||
kfree(txq->cmd[slots_num]);
|
||||
txq->cmd[slots_num] = NULL;
|
||||
}
|
||||
return -ENOMEM;
|
||||
}
|
||||
/**
|
||||
* iwl_hw_txq_ctx_free - Free TXQ Context
|
||||
|
|
|
|||
Loading…
Reference in a new issue