]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
bonding: move processing of recv handlers into handle_frame()
authorJiri Pirko <jpirko@redhat.com>
Tue, 19 Apr 2011 03:48:16 +0000 (03:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Apr 2011 19:00:30 +0000 (12:00 -0700)
commit3aba891dde3842d89ad022237b99c1ed308040b0
tree7b89bcdc0362a1fdd50d74c3a8108f16fecfa5b1
parent22d5969fb450afd3a4aff606360f7d52c5a3a628
bonding: move processing of recv handlers into handle_frame()

Since now when bonding uses rx_handler, all traffic going into bond
device goes thru bond_handle_frame. So there's no need to go back into
bonding code later via ptype handlers. This patch converts
original ptype handlers into "bonding receive probes". These functions
are called from bond_handle_frame and they are registered per-mode.

Note that vlan packets are also handled because they are always untagged
thanks to vlan_untag()

Note that this also allows arpmon for eth-bond-bridge-vlan topology.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_alb.h
drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_sysfs.c
drivers/net/bonding/bonding.h
net/core/dev.c