linux-toradex.git/drivers/net/bonding, branch v3.6.1

netpoll: check netpoll tx status on the right device

2012-08-14T21:33:32+00:00

Although this doesn't matter actually, because netpoll_tx_running()
doesn't use the parameter, the code will be more readable.

For team_dev_queue_xmit() we have to move it down to avoid
compile errors.

Cc: David Miller 
Signed-off-by: Jiri Pirko 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: make __netpoll_cleanup non-block

2012-08-14T21:33:30+00:00

Like the previous patch, slave_disable_netpoll() and __netpoll_cleanup()
may be called with read_lock() held too, so we should make them
non-block, by moving the cleanup and kfree() to call_rcu_bh() callbacks.

Cc: "David S. Miller" 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

netpoll: use GFP_ATOMIC in slave_enable_netpoll() and __netpoll_setup()

2012-08-14T21:33:30+00:00

slave_enable_netpoll() and __netpoll_setup() may be called
with read_lock() held, so should use GFP_ATOMIC to allocate
memory. Eric suggested to pass gfp flags to __netpoll_setup().

Cc: Eric Dumazet 
Cc: "David S. Miller" 
Reported-by: Dan Carpenter 
Signed-off-by: Eric Dumazet 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

bond_sysfs: use real_num_tx_queues rather than params.tx_queue

2012-07-20T18:07:00+00:00

Since now number of tx queues can be specified during bond instance
creation and therefore it may differ from params.tx_queues, use rather
real_num_tx_queues for boundary check.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

net: rename bond_queue_mapping to slave_dev_queue_mapping

2012-07-20T18:07:00+00:00

As this is going to be used not only by bonding.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

rtnl: allow to specify different num for rx and tx queue count

2012-07-20T18:06:59+00:00

Also cut out unused function parameters and possible err in return
value.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bonding: refine IFF_XMIT_DST_RELEASE capability

2012-07-18T16:31:25+00:00

Some workloads greatly benefit of IFF_XMIT_DST_RELEASE capability
on output net device, avoiding dirtying dst refcount.

bonding currently disables IFF_XMIT_DST_RELEASE unconditionally.

If all slaves have the IFF_XMIT_DST_RELEASE bit set, then
bonding master can also have it in its priv_flags

Signed-off-by: Eric Dumazet 
Cc: Jay Vosburgh 
Cc: Andy Gospodarek 
Cc: Tom Herbert 
Signed-off-by: David S. Miller

netpoll: move np->dev and np->dev_name init into __netpoll_setup()

2012-07-17T16:02:36+00:00

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

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

2012-07-11T06:56:33+00:00

Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller

bonding: debugfs and network namespaces are incompatible

2012-07-09T21:49:15+00:00

The bonding debugfs support has been broken in the presence of network
namespaces since it has been added.  The debugfs support does not handle
multiple bonding devices with the same name in different network
namespaces.

I haven't had any bug reports, and I'm not interested in getting any.
Disable the debugfs support when network namespaces are enabled.

Signed-off-by: "Eric W. Biederman" 
Signed-off-by: David S. Miller