linux.git/drivers/net/bonding, branch v3.6-rc2

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

bonding: Manage /proc/net/bonding/ entries from the netdev events

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

It was recently reported that moving a bonding device between network
namespaces causes warnings from /proc.  It turns out after the move we
were trying to add and to remove the /proc/net/bonding entries from the
wrong network namespace.

Move the bonding /proc registration code into the NETDEV_REGISTER and
NETDEV_UNREGISTER events where the proc registration and unregistration
will always happen at the right time.

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

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

2012-06-25T22:50:32+00:00

Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller

bonding: show all the link status of slaves

2012-06-17T23:23:54+00:00

There are four link statuses of a bonding slave, the procfs
code shows a wrong status when using downdelay/updelay:

	(slave->link == BOND_LINK_UP) ?  "up" : "down"

It doesn't respect the rest two statuses. This patch fixes it.

Cc: Jay Vosburgh 
Cc: Andy Gospodarek 
Cc: "David S. Miller" 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller