diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-04-18 23:48:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-25 15:00:30 -0400 |
commit | 3aba891dde3842d89ad022237b99c1ed308040b0 (patch) | |
tree | 7b89bcdc0362a1fdd50d74c3a8108f16fecfa5b1 /drivers/net/bonding/bond_alb.h | |
parent | 22d5969fb450afd3a4aff606360f7d52c5a3a628 (diff) |
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>
Diffstat (limited to 'drivers/net/bonding/bond_alb.h')
-rw-r--r-- | drivers/net/bonding/bond_alb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h index 8ca7158b2dda..90f140a2d197 100644 --- a/drivers/net/bonding/bond_alb.h +++ b/drivers/net/bonding/bond_alb.h | |||
@@ -129,7 +129,6 @@ struct alb_bond_info { | |||
129 | int lp_counter; | 129 | int lp_counter; |
130 | /* -------- rlb parameters -------- */ | 130 | /* -------- rlb parameters -------- */ |
131 | int rlb_enabled; | 131 | int rlb_enabled; |
132 | struct packet_type rlb_pkt_type; | ||
133 | struct rlb_client_info *rx_hashtbl; /* Receive hash table */ | 132 | struct rlb_client_info *rx_hashtbl; /* Receive hash table */ |
134 | spinlock_t rx_hashtbl_lock; | 133 | spinlock_t rx_hashtbl_lock; |
135 | u32 rx_hashtbl_head; | 134 | u32 rx_hashtbl_head; |