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

Commit b5f1f555 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:
  bnx2: fix poll_controller to pass proper structures and check all rx queues
  niu: Fix readq implementation when architecture does not provide one.
  hostap: pad the skb->cb usage in lieu of a proper fix
  rtl8187 : support for Sitecom WL-168 0001 v4
  mac80211: fix notify_mac function
  rtl8187: Add Abocom USB ID
  net: put_cmsg_compat + SO_TIMESTAMP[NS]: use same name for value as caller
  tcp_htcp: last_cong bug fix
  [netdrvr] smc911x: fix for driver resume (and compilation warning)
  RDMA/cxgb3: deadlock in iw_cxgb3 can cause hang when configuring interface.
  cxgb3 - Limit multiqueue setting to msi-x
  cxgb3 - eeprom read fixes
  myri10ge: fix stop/go ordering even more
parents 45a9524a b2af2c1d

drivers/net/bnx2.c

+6 −3
Original line number Diff line number Diff line
@@ -7204,10 +7204,13 @@ static void 
poll_bnx2(struct net_device *dev)

{

	struct bnx2 *bp = netdev_priv(dev);

	int i;



	disable_irq(bp->pdev->irq);

	bnx2_interrupt(bp->pdev->irq, dev);

	enable_irq(bp->pdev->irq);

	for (i = 0; i < bp->irq_nvecs; i++) {

		disable_irq(bp->irq_tbl[i].vector);

		bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);

		enable_irq(bp->irq_tbl[i].vector);

	}

}

#endif

drivers/net/cxgb3/cxgb3_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2701,7 +2701,7 @@ static void set_nqsets(struct adapter *adap) 
	int hwports = adap->params.nports;

	int nqsets = SGE_QSETS;



	if (adap->params.rev > 0) {

	if (adap->params.rev > 0 && adap->flags & USING_MSIX) {

		if (hwports == 2 &&

		    (hwports * nqsets > SGE_QSETS ||

		     num_cpus >= nqsets / hwports))

drivers/net/cxgb3/t3_hw.c

+7 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ struct t3_vpd { 
	u32 pad;		/* for multiple-of-4 sizing and alignment */

};



#define EEPROM_MAX_POLL   4

#define EEPROM_MAX_POLL   40

#define EEPROM_STAT_ADDR  0x4000

#define VPD_BASE          0xc00
@@ -3690,6 +3690,12 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, 
			;



		pti = &port_types[adapter->params.vpd.port_type[j]];

		if (!pti->phy_prep) {

			CH_ALERT(adapter, "Invalid port type index %d\n",

				 adapter->params.vpd.port_type[j]);

			return -EINVAL;

		}



		ret = pti->phy_prep(&p->phy, adapter, ai->phy_base_addr + j,

				    ai->mdio_ops);

		if (ret)

drivers/net/myri10ge/myri10ge.c

+3 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#include "myri10ge_mcp.h"

#include "myri10ge_mcp_gen_header.h"



#define MYRI10GE_VERSION_STR "1.4.3-1.375"

#define MYRI10GE_VERSION_STR "1.4.3-1.378"



MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");

MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -1393,6 +1393,7 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index) 
		if (tx->req == tx->done) {

			tx->queue_active = 0;

			put_be32(htonl(1), tx->send_stop);

			mb();

			mmiowb();

		}

		__netif_tx_unlock(dev_queue);
@@ -2865,6 +2866,7 @@ static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev) 
	if ((mgp->dev->real_num_tx_queues > 1) && tx->queue_active == 0) {

		tx->queue_active = 1;

		put_be32(htonl(1), tx->send_go);

		mb();

		mmiowb();

	}

	tx->pkt_start++;

drivers/net/niu.c

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ MODULE_VERSION(DRV_MODULE_VERSION); 
#ifndef readq

static u64 readq(void __iomem *reg)

{

	return (((u64)readl(reg + 0x4UL) << 32) |

		(u64)readl(reg));

	return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);

}



static void writeq(u64 val, void __iomem *reg)