linux.git/net/core/netpoll.c, branch v2.6.39

bond: service netpoll arp queue on master device

2011-02-28T04:11:54+00:00

Neil pointed out that we can't send ARP reply on behalf of slaves,
we need to move the arp queue to their bond device.

Signed-off-by: WANG Cong 
Acked-by: Neil Horman 
Signed-off-by: David S. Miller

netpoll: remove IFF_IN_NETPOLL flag

2011-02-28T00:11:51+00:00

V4: rebase to net-next-2.6

This patch removes the flag IFF_IN_NETPOLL, we don't need it any more since
we have netpoll_tx_running() now.

Signed-off-by: WANG Cong 
Acked-by: Neil Horman 
Cc: Herbert Xu 
Signed-off-by: David S. Miller

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2011-01-08T00:58:04+00:00

* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
  usb: don't use flush_scheduled_work()
  speedtch: don't abuse struct delayed_work
  media/video: don't use flush_scheduled_work()
  media/video: explicitly flush request_module work
  ioc4: use static work_struct for ioc4_load_modules()
  init: don't call flush_scheduled_work() from do_initcalls()
  s390: don't use flush_scheduled_work()
  rtc: don't use flush_scheduled_work()
  mmc: update workqueue usages
  mfd: update workqueue usages
  dvb: don't use flush_scheduled_work()
  leds-wm8350: don't use flush_scheduled_work()
  mISDN: don't use flush_scheduled_work()
  macintosh/ams: don't use flush_scheduled_work()
  vmwgfx: don't use flush_scheduled_work()
  tpm: don't use flush_scheduled_work()
  sonypi: don't use flush_scheduled_work()
  hvsi: don't use flush_scheduled_work()
  xen: don't use flush_scheduled_work()
  gdrom: don't use flush_scheduled_work()
  ...

Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.

net: kill unused macros

2010-12-20T05:59:35+00:00

These macros never be used, so remove them.

Signed-off-by: Shan Wei 
Signed-off-by: David S. Miller

workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()

2010-12-15T09:56:11+00:00

cancel_rearming_delayed_work[queue]() has been superceded by
cancel_delayed_work_sync() quite some time ago.  Convert all the
in-kernel users.  The conversions are completely equivalent and
trivial.

Signed-off-by: Tejun Heo 
Acked-by: "David S. Miller" 
Acked-by: Greg Kroah-Hartman 
Acked-by: Evgeniy Polyakov 
Cc: Jeff Garzik 
Cc: Benjamin Herrenschmidt 
Cc: Mauro Carvalho Chehab 
Cc: netdev@vger.kernel.org
Cc: Anton Vorontsov 
Cc: David Woodhouse 
Cc: "J. Bruce Fields" 
Cc: Neil Brown 
Cc: Alex Elder 
Cc: xfs-masters@oss.sgi.com
Cc: Christoph Lameter 
Cc: Pekka Enberg 
Cc: Andrew Morton 
Cc: netfilter-devel@vger.kernel.org
Cc: Trond Myklebust 
Cc: linux-nfs@vger.kernel.org

net: add netif_tx_queue_frozen_or_stopped

2010-11-28T18:47:18+00:00

When testing struct netdev_queue state against FROZEN bit, we also test
XOFF bit. We can test both bits at once and save some cycles.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

netpoll: Revert napi_poll fix for bonding driver

2010-10-20T08:44:30+00:00

In an erlier patch I modified napi_poll so that devices with IFF_MASTER polled
the per_cpu list instead of the device list for napi.  I did this because the
bonding driver has no napi instances to poll, it instead expects to check the
slave devices napi instances, which napi_poll was unaware of.  Looking at this
more closely however, I now see this isn't strictly needed.  As the bond driver
poll_controller calls the slaves poll_controller via netpoll_poll_dev, which
recursively calls poll_napi on each slave, allowing those napi instances to get
serviced.  The earlier patch isn't at all harmfull, its just not needed, so lets
revert it to make the code cleaner.  Sorry for the noise,

Signed-off-by: Neil Horman 
Reviewed-by: WANG Cong 
Signed-off-by: David S. Miller

bonding: Fix napi poll for bonding driver

2010-10-18T15:32:08+00:00

Usually the netpoll path, when preforming a napi poll can get away with just
polling all the napi instances of the configured device.  Thats not the case for
the bonding driver however, as the napi instances which may wind up getting
flagged as needing polling after the poll_controller call don't belong to the
bonded device, but rather to the slave devices.  Fix this by checking the device
in question for the IFF_MASTER flag, if set, we know we need to check the full
poll list for this cpu, rather than just the devices napi instance list.

Signed-off-by: Neil Horman 
Signed-off-by: David S. Miller

bonding: Fix bonding drivers improper modification of netpoll structure

2010-10-18T15:32:07+00:00

The bonding driver currently modifies the netpoll structure in its xmit path
while sending frames from netpoll.  This is racy, as other cpus can access the
netpoll structure in parallel. Since the bonding driver points np->dev to a
slave device, other cpus can inadvertently attempt to send data directly to
slave devices, leading to improper locking with the bonding master, lost frames,
and deadlocks.  This patch fixes that up.

This patch also removes the real_dev pointer from the netpoll structure as that
data is really only used by bonding in the poll_controller, and we can emulate
its behavior by check each slave for IS_UP.

Signed-off-by: Neil Horman 
Signed-off-by: David S. Miller

Revert "net: remove zap_completion_queue"

2010-08-03T07:24:04+00:00

This reverts commit 15e83ed78864d0625e87a85f09b297c0919a4797.

As explained by Johannes Berg, the optimization made here is
invalid.  Or, at best, incomplete.

Not only destructor invocation, but conntract entry releasing
must be executed outside of hw IRQ context.

So just checking "skb->destructor" is insufficient.

Signed-off-by: David S. Miller