diff options
| author | Jiri Bohac <jbohac@suse.cz> | 2012-05-09 01:01:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-10 23:30:01 -0400 |
| commit | 13a8e0c8cdb43982372bd6c65fb26839c8fd8ce9 (patch) | |
| tree | 824f5daec5b68663a7feaebb76ebbb2cfce5d4c0 /drivers/net/bonding/bond_3ad.h | |
| parent | 38bf1953987c1735f3c9140fca762949a8cae507 (diff) | |
| download | linux-13a8e0c8cdb43982372bd6c65fb26839c8fd8ce9.tar.bz2 | |
bonding: don't increase rx_dropped after processing LACPDUs
Since commit 3aba891d, bonding processes LACP frames (802.3ad
mode) with bond_handle_frame(). Currently a copy of the skb is
made and the original is left to be processed by other
rx_handlers and the rest of the network stack by returning
RX_HANDLER_ANOTHER. As there is no protocol handler for
PKT_TYPE_LACPDU, the frame is dropped and dev->rx_dropped
increased.
Fix this by making bond_handle_frame() return RX_HANDLER_CONSUMED
if bonding has processed the LACP frame.
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.h')
| -rw-r--r-- | drivers/net/bonding/bond_3ad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h index 235b2cc58b28..5ee7e3c45db7 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h @@ -274,7 +274,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave); void bond_3ad_handle_link_change(struct slave *slave, char link); int bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info); int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev); -void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond, +int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond, struct slave *slave); int bond_3ad_set_carrier(struct bonding *bond); void bond_3ad_update_lacp_rate(struct bonding *bond); |