linux.git/net/core/netpoll.c, branch v3.4

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-02-19T21:03:15+00:00

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.

Signed-off-by: David S. Miller

netpoll: netpoll_poll_dev() should access dev->flags

2012-02-14T20:24:26+00:00

commit 5a698af53f (bond: service netpoll arp queue on master device)
tested IFF_SLAVE flag against dev->priv_flags instead of dev->flags

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

netpoll: Neaten MAX_SKB_SIZE macro

2012-02-01T19:20:27+00:00

Add the types in the packet layout order.

Signed-off-by: Joe Perches 
Reviewed-by: WANG Cong 
Signed-off-by: David S. Miller

netpoll: Convert printks to np_ and add pr_fmt

2012-02-01T19:20:27+00:00

Use a more current message logging style.
Add pr_fmt to prefix dmesg output with "netpoll: "
Add macros to print np->name.

Signed-off-by: Joe Perches 
Reviewed-by: WANG Cong 
Signed-off-by: David S. Miller

net: reintroduce missing rcu_assign_pointer() calls

2012-01-12T20:26:56+00:00

commit a9b3cd7f32 (rcu: convert uses of rcu_assign_pointer(x, NULL) to
RCU_INIT_POINTER) did a lot of incorrect changes, since it did a
complete conversion of rcu_assign_pointer(x, y) to RCU_INIT_POINTER(x,
y).

We miss needed barriers, even on x86, when y is not NULL.

Signed-off-by: Eric Dumazet 
CC: Stephen Hemminger 
CC: Paul E. McKenney 
Signed-off-by: David S. Miller

net: Add queue state xoff flag for stack

2011-11-29T17:46:19+00:00

Create separate queue state flags so that either the stack or drivers
can turn on XOFF.  Added a set of functions used in the stack to determine
if a queue is really stopped (either by stack or driver)

Signed-off-by: Tom Herbert 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: Remove all uses of LL_ALLOCATED_SPACE

2011-11-18T19:37:09+00:00

net: Remove all uses of LL_ALLOCATED_SPACE

The macro LL_ALLOCATED_SPACE was ill-conceived.  It applies the
alignment to the sum of needed_headroom and needed_tailroom.  As
the amount that is then reserved for head room is needed_headroom
with alignment, this means that the tail room left may be too small.

This patch replaces all uses of LL_ALLOCATED_SPACE with the macro
LL_RESERVED_SPACE and direct reference to needed_tailroom.

This also fixes the problem with needed_headroom changing between
allocating the skb and reserving the head room.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31T23:30:30+00:00

These files are non modular, but need to export symbols using
the macros now living in export.h -- call out the include so
that things won't break when we remove the implicit presence
of module.h from everywhere.

Signed-off-by: Paul Gortmaker

Merge branch 'master' of github.com:davem330/net

2011-09-22T07:23:13+00:00

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

netpoll: fix incorrect access to skb data in __netpoll_rx

2011-08-26T16:49:04+00:00

__netpoll_rx() doesnt properly handle skbs with small header

pskb_may_pull() or pskb_trim_rcsum() can change skb->data, we must
reload it.

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