Commit 5ed18368 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:
  net: Fix percpu counters deadlock
  cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits: net
  drivers/net/usb: use USB API functions rather than constants
  cls_cgroup: clean up Kconfig
  cls_cgroup: clean up for cgroup part
  cls_cgroup: fix an oops when removing a cgroup
  EtherExpress16: fix printing timed out status
  mlx4_en: Added "set_ringparam" Ethtool interface implementation
  mlx4_en: Always allocate RX ring for each interrupt vector
  mlx4_en: Verify number of RX rings doesn't exceed MAX_RX_RINGS
  IPVS: Make "no destination available" message more consistent between schedulers
  net: KS8695: removed duplicated #include
  tun: Fix SIOCSIFHWADDR error.
  smsc911x: compile fix re netif_rx signature changes
  netns: foreach_netdev_safe is insufficient in default_device_exit
  net: make xfrm_statistics_seq_show use generic snmp_fold_field
  net: Fix more NAPI interface netdev argument drop fallout.
  net: Fix unused variable warnings in pasemi_mac.c and spider_net.c
parents ab70537c eb4dea58

drivers/net/arm/ep93xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ poll_some_more: 
		}

		spin_unlock_irq(&ep->rx_lock);



		if (more && netif_rx_reschedule(dev, napi))

		if (more && netif_rx_reschedule(napi))

			goto poll_some_more;

	}

drivers/net/arm/ixp4xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int eth_poll(struct napi_struct *napi, int budget) 
			netif_rx_complete(napi);

			qmgr_enable_irq(rxq);

			if (!qmgr_stat_empty(rxq) &&

			    netif_rx_reschedule(dev, napi)) {

			    netif_rx_reschedule(napi)) {

#if DEBUG_RX

				printk(KERN_DEBUG "%s: eth_poll"

				       " netif_rx_reschedule successed\n",

drivers/net/arm/ks8695net.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/irq.h>

#include <linux/delay.h>

#include <linux/io.h>



#include <asm/irq.h>

drivers/net/eexpress.h

+28 −28
Original line number Diff line number Diff line
@@ -68,17 +68,17 @@ 
 */



/* these functions take the SCB status word and test the relevant status bit */

#define SCB_complete(s) ((s&0x8000)!=0)

#define SCB_rxdframe(s) ((s&0x4000)!=0)

#define SCB_CUdead(s)   ((s&0x2000)!=0)

#define SCB_RUdead(s)   ((s&0x1000)!=0)

#define SCB_ack(s)      (s & 0xf000)

#define SCB_complete(s) (((s) & 0x8000) != 0)

#define SCB_rxdframe(s) (((s) & 0x4000) != 0)

#define SCB_CUdead(s)   (((s) & 0x2000) != 0)

#define SCB_RUdead(s)   (((s) & 0x1000) != 0)

#define SCB_ack(s)      ((s) & 0xf000)



/* Command unit status: 0=idle, 1=suspended, 2=active */

#define SCB_CUstat(s)   ((s&0x0300)>>8)

#define SCB_CUstat(s)   (((s)&0x0300)>>8)



/* Receive unit status: 0=idle, 1=suspended, 2=out of resources, 4=ready */

#define SCB_RUstat(s)   ((s&0x0070)>>4)

#define SCB_RUstat(s)   (((s)&0x0070)>>4)



/* SCB commands */

#define SCB_CUnop       0x0000
@@ -98,18 +98,18 @@ 
 * Command block defines

 */



#define Stat_Done(s)    ((s&0x8000)!=0)

#define Stat_Busy(s)    ((s&0x4000)!=0)

#define Stat_OK(s)      ((s&0x2000)!=0)

#define Stat_Abort(s)   ((s&0x1000)!=0)

#define Stat_STFail     ((s&0x0800)!=0)

#define Stat_TNoCar(s)  ((s&0x0400)!=0)

#define Stat_TNoCTS(s)  ((s&0x0200)!=0)

#define Stat_TNoDMA(s)  ((s&0x0100)!=0)

#define Stat_TDefer(s)  ((s&0x0080)!=0)

#define Stat_TColl(s)   ((s&0x0040)!=0)

#define Stat_TXColl(s)  ((s&0x0020)!=0)

#define Stat_NoColl(s)  (s&0x000f)

#define Stat_Done(s)    (((s) & 0x8000) != 0)

#define Stat_Busy(s)    (((s) & 0x4000) != 0)

#define Stat_OK(s)      (((s) & 0x2000) != 0)

#define Stat_Abort(s)   (((s) & 0x1000) != 0)

#define Stat_STFail     (((s) & 0x0800) != 0)

#define Stat_TNoCar(s)  (((s) & 0x0400) != 0)

#define Stat_TNoCTS(s)  (((s) & 0x0200) != 0)

#define Stat_TNoDMA(s)  (((s) & 0x0100) != 0)

#define Stat_TDefer(s)  (((s) & 0x0080) != 0)

#define Stat_TColl(s)   (((s) & 0x0040) != 0)

#define Stat_TXColl(s)  (((s) & 0x0020) != 0)

#define Stat_NoColl(s)  ((s) & 0x000f)



/* Cmd_END will end AFTER the command if this is the first

 * command block after an SCB_CUstart, but BEFORE the command
@@ -136,16 +136,16 @@ 
 * Frame Descriptor (Receive block) defines

 */



#define FD_Done(s)  ((s&0x8000)!=0)

#define FD_Busy(s)  ((s&0x4000)!=0)

#define FD_OK(s)    ((s&0x2000)!=0)

#define FD_Done(s)  (((s) & 0x8000) != 0)

#define FD_Busy(s)  (((s) & 0x4000) != 0)

#define FD_OK(s)    (((s) & 0x2000) != 0)



#define FD_CRC(s)   ((s&0x0800)!=0)

#define FD_Align(s) ((s&0x0400)!=0)

#define FD_Resrc(s) ((s&0x0200)!=0)

#define FD_DMA(s)   ((s&0x0100)!=0)

#define FD_Short(s) ((s&0x0080)!=0)

#define FD_NoEOF(s) ((s&0x0040)!=0)

#define FD_CRC(s)   (((s) & 0x0800) != 0)

#define FD_Align(s) (((s) & 0x0400) != 0)

#define FD_Resrc(s) (((s) & 0x0200) != 0)

#define FD_DMA(s)   (((s) & 0x0100) != 0)

#define FD_Short(s) (((s) & 0x0080) != 0)

#define FD_NoEOF(s) (((s) & 0x0040) != 0)



struct rfd_header {

	volatile unsigned long flags;

drivers/net/mlx4/en_main.c

+4 −7
Original line number Diff line number Diff line
@@ -169,13 +169,10 @@ static void *mlx4_en_add(struct mlx4_dev *dev) 
	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {

		mlx4_info(mdev, "Using %d tx rings for port:%d\n",

			  mdev->profile.prof[i].tx_ring_num, i);

		if (!mdev->profile.prof[i].rx_ring_num) {

			mdev->profile.prof[i].rx_ring_num = dev->caps.num_comp_vectors;

		mdev->profile.prof[i].rx_ring_num =

			min_t(int, dev->caps.num_comp_vectors, MAX_RX_RINGS);

		mlx4_info(mdev, "Defaulting to %d rx rings for port:%d\n",

			  mdev->profile.prof[i].rx_ring_num, i);

		} else

			mlx4_info(mdev, "Using %d rx rings for port:%d\n",

				  mdev->profile.prof[i].rx_ring_num, i);

	}



	/* Create our own workqueue for reset/multicast tasks

CRA Git | Maintained and supported by SUSTech CRA and CCSE