Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 316343e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents ec0c15af fca1287a

drivers/net/bnx2x.h

+3 −2
Original line number Diff line number Diff line
@@ -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

drivers/net/bnx2x_main.c

+17 −17
Original line number Diff line number Diff line
@@ -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;

drivers/net/ixgbe/ixgbe_main.c

+6 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/netxen/netxen_nic_main.c

+0 −10
Original line number Diff line number Diff line
@@ -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,

drivers/net/pcmcia/axnet_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -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),