Merge branch 'bonding-next'

Browse source

Ding Tianhong says:

====================
bonding: support QinQ for bond arp interval

v1->v2: remvoe the comment "TODO: QinQ?".
	convert pr_xxx() to pr_xxx_ratelimited() for arp interval.

v2->v3: remove the unnecessary log for arp interval and add net ratelimit to
	avoid spam log.

v3->v4: Add ratelimit for debugging is not a good idea, it will miss some message
	if the user turns the debugging on, so don't add ratelimited on debugging.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-03-26 16:42:02 -04:00

parent 5a6b99170c 4873ac3c8e

commit b620cb3e82

4 changed files with 69 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

73

drivers/net/bonding/bond_main.c

View file

5

drivers/net/bonding/bonding.h

View file

7

include/linux/if_vlan.h

View file

6

net/8021q/vlan_core.c

View file