Commit fbb5ba92 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:
  ipv4: make default for INET_LRO consistent with help text
  net: fix skb_seq_read returning wrong offset/length for page frag data
  pkt_sched: gen_estimator: use 64 bit intermediate counters for bps
  be2net: add two new pci device ids to pci device table
  sch_teql: should not dereference skb after ndo_start_xmit()
  tcp: fix MSG_PEEK race check
  Doc: fixed descriptions on /proc/sys/net/core/* and /proc/sys/net/unix/*
  Neterion: *FIFO1_DMA_ERR set twice, should 2nd be *FIFO2_DMA_ERR?
  mv643xx_eth: fix PPC DMA breakage
  bonding: fix link down handling in 802.3ad mode
  bridge: fix initial packet flood if !STP
  bridge: relay bridge multicast pkgs if !STP
  NET: Meth: Fix unsafe mix of irq and non-irq spinlocks.
  mlx4_en: Fix not deleted napi structures
  ipconfig: handle case of delayed DHCP server
  netpoll: don't dereference NULL dev from np
  wimax/i2400m: fix device crash: fix optimization in _roq_queue_update_ws
parents 4fe11032 bc8a5397

Documentation/networking/ip-sysctl.txt

+12 −3
Original line number Diff line number Diff line
@@ -1266,13 +1266,22 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max 
sctp_wmem  - vector of 3 INTEGERs: min, default, max

	See tcp_wmem for a description.



UNDOCUMENTED:



/proc/sys/net/core/*

	dev_weight FIXME

dev_weight - INTEGER

	The maximum number of packets that kernel can handle on a NAPI

	interrupt, it's a Per-CPU variable.



	Default: 64



/proc/sys/net/unix/*

	max_dgram_qlen FIXME

max_dgram_qlen - INTEGER

	The maximum length of dgram socket receive queue



	Default: 10





UNDOCUMENTED:



/proc/sys/net/irda/*

	fast_poll_increase FIXME

drivers/net/benet/be.h

+14 −0
Original line number Diff line number Diff line
@@ -35,8 +35,22 @@ 
#define DRV_VER			"2.0.348"

#define DRV_NAME		"be2net"

#define BE_NAME			"ServerEngines BladeEngine2 10Gbps NIC"

#define OC_NAME			"Emulex OneConnect 10Gbps NIC"

#define DRV_DESC		BE_NAME "Driver"



#define BE_VENDOR_ID 		0x19a2

#define BE_DEVICE_ID1		0x211

#define OC_DEVICE_ID1		0x700

#define OC_DEVICE_ID2		0x701



static inline char *nic_name(struct pci_dev *pdev)

{

	if (pdev->device == OC_DEVICE_ID1 || pdev->device == OC_DEVICE_ID2)

		return OC_NAME;

	else

		return BE_NAME;

}



/* Number of bytes of an RX frame that are copied to skb->data */

#define BE_HDR_LEN 		64

#define BE_MAX_JUMBO_FRAME_SIZE	9018

drivers/net/benet/be_main.c

+5 −5
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ static unsigned int rx_frag_size = 2048; 
module_param(rx_frag_size, uint, S_IRUGO);

MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data.");



#define BE_VENDOR_ID 		0x19a2

#define BE2_DEVICE_ID_1 	0x0211

static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {

	{ PCI_DEVICE(BE_VENDOR_ID, BE2_DEVICE_ID_1) },

	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },

	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },

	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },

	{ 0 }

};

MODULE_DEVICE_TABLE(pci, be_dev_ids);
@@ -1859,7 +1859,7 @@ static int __devinit be_probe(struct pci_dev *pdev, 
	if (status != 0)

		goto stats_clean;



	dev_info(&pdev->dev, BE_NAME " port %d\n", adapter->port_num);

	dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num);

	return 0;



stats_clean:
@@ -1873,7 +1873,7 @@ rel_reg: 
disable_dev:

	pci_disable_device(pdev);

do_none:

	dev_warn(&pdev->dev, BE_NAME " initialization failed\n");

	dev_err(&pdev->dev, "%s initialization failed\n", nic_name(pdev));

	return status;

}

drivers/net/bonding/bond_3ad.c

+8 −3
Original line number Diff line number Diff line
@@ -1465,6 +1465,12 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best, 
	return best;

}



static int agg_device_up(const struct aggregator *agg)

{

	return (netif_running(agg->slave->dev) &&

		netif_carrier_ok(agg->slave->dev));

}



/**

 * ad_agg_selection_logic - select an aggregation group for a team

 * @aggregator: the aggregator we're looking at
@@ -1496,14 +1502,13 @@ static void ad_agg_selection_logic(struct aggregator *agg) 
	struct port *port;



	origin = agg;



	active = __get_active_agg(agg);

	best = active;

	best = (active && agg_device_up(active)) ? active : NULL;



	do {

		agg->is_active = 0;



		if (agg->num_of_ports)

		if (agg->num_of_ports && agg_device_up(agg))

			best = ad_agg_selection_test(best, agg);



	} while ((agg = __get_next_agg(agg)));

drivers/net/meth.c

+14 −13
Original line number Diff line number Diff line
@@ -127,11 +127,11 @@ static unsigned long mdio_read(struct meth_private *priv, unsigned long phyreg) 
static int mdio_probe(struct meth_private *priv)

{

	int i;

	unsigned long p2, p3;

	unsigned long p2, p3, flags;

	/* check if phy is detected already */

	if(priv->phy_addr>=0&&priv->phy_addr<32)

		return 0;

	spin_lock(&priv->meth_lock);

	spin_lock_irqsave(&priv->meth_lock, flags);

	for (i=0;i<32;++i){

		priv->phy_addr=i;

		p2=mdio_read(priv,2);
@@ -157,7 +157,7 @@ static int mdio_probe(struct meth_private *priv) 
			break;

		}

	}

	spin_unlock(&priv->meth_lock);

	spin_unlock_irqrestore(&priv->meth_lock, flags);

	if(priv->phy_addr<32) {

		return 0;

	}
@@ -373,14 +373,14 @@ static int meth_release(struct net_device *dev) 
static void meth_rx(struct net_device* dev, unsigned long int_status)

{

	struct sk_buff *skb;

	unsigned long status;

	unsigned long status, flags;

	struct meth_private *priv = netdev_priv(dev);

	unsigned long fifo_rptr = (int_status & METH_INT_RX_RPTR_MASK) >> 8;



	spin_lock(&priv->meth_lock);

	spin_lock_irqsave(&priv->meth_lock, flags);

	priv->dma_ctrl &= ~METH_DMA_RX_INT_EN;

	mace->eth.dma_ctrl = priv->dma_ctrl;

	spin_unlock(&priv->meth_lock);

	spin_unlock_irqrestore(&priv->meth_lock, flags);



	if (int_status & METH_INT_RX_UNDERFLOW) {

		fifo_rptr = (fifo_rptr - 1) & 0x0f;
@@ -452,12 +452,12 @@ static void meth_rx(struct net_device* dev, unsigned long int_status) 
		mace->eth.rx_fifo = priv->rx_ring_dmas[priv->rx_write];

		ADVANCE_RX_PTR(priv->rx_write);

	}

	spin_lock(&priv->meth_lock);

	spin_lock_irqsave(&priv->meth_lock, flags);

	/* In case there was underflow, and Rx DMA was disabled */

	priv->dma_ctrl |= METH_DMA_RX_INT_EN | METH_DMA_RX_EN;

	mace->eth.dma_ctrl = priv->dma_ctrl;

	mace->eth.int_stat = METH_INT_RX_THRESHOLD;

	spin_unlock(&priv->meth_lock);

	spin_unlock_irqrestore(&priv->meth_lock, flags);

}



static int meth_tx_full(struct net_device *dev)
@@ -470,11 +470,11 @@ static int meth_tx_full(struct net_device *dev) 
static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status)

{

	struct meth_private *priv = netdev_priv(dev);

	unsigned long status;

	unsigned long status, flags;

	struct sk_buff *skb;

	unsigned long rptr = (int_status&TX_INFO_RPTR) >> 16;



	spin_lock(&priv->meth_lock);

	spin_lock_irqsave(&priv->meth_lock, flags);



	/* Stop DMA notification */

	priv->dma_ctrl &= ~(METH_DMA_TX_INT_EN);
@@ -527,12 +527,13 @@ static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status) 
	}



	mace->eth.int_stat = METH_INT_TX_EMPTY | METH_INT_TX_PKT;

	spin_unlock(&priv->meth_lock);

	spin_unlock_irqrestore(&priv->meth_lock, flags);

}



static void meth_error(struct net_device* dev, unsigned status)

{

	struct meth_private *priv = netdev_priv(dev);

	unsigned long flags;



	printk(KERN_WARNING "meth: error status: 0x%08x\n",status);

	/* check for errors too... */
@@ -547,7 +548,7 @@ static void meth_error(struct net_device* dev, unsigned status) 
		printk(KERN_WARNING "meth: Rx overflow\n");

	if (status & (METH_INT_RX_UNDERFLOW)) {

		printk(KERN_WARNING "meth: Rx underflow\n");

		spin_lock(&priv->meth_lock);

		spin_lock_irqsave(&priv->meth_lock, flags);

		mace->eth.int_stat = METH_INT_RX_UNDERFLOW;

		/* more underflow interrupts will be delivered,

		 * effectively throwing us into an infinite loop.
@@ -555,7 +556,7 @@ static void meth_error(struct net_device* dev, unsigned status) 
		priv->dma_ctrl &= ~METH_DMA_RX_EN;

		mace->eth.dma_ctrl = priv->dma_ctrl;

		DPRINTK("Disabled meth Rx DMA temporarily\n");

		spin_unlock(&priv->meth_lock);

		spin_unlock_irqrestore(&priv->meth_lock, flags);

	}

	mace->eth.int_stat = METH_INT_ERROR;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE