diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-13 21:45:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-13 21:45:13 +0200 |
| commit | b99215cdc6e191f5649687536d4fb0faa3d7f56e (patch) | |
| tree | fa80307140d312a76ad987000eb2bcb37a04f634 /drivers/net/bonding/bonding.h | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| download | linux-b99215cdc6e191f5649687536d4fb0faa3d7f56e.tar.xz linux-b99215cdc6e191f5649687536d4fb0faa3d7f56e.zip | |
bonding: Fix LACPDU rx_dropped commit.
I applied the wrong version of Jiri's bonding fix in commit
13a8e0c8cdb43982372bd6c65fb26839c8fd8ce9 ("bonding: don't increase
rx_dropped after processing LACPDUs")
I applied v3, which introduces warnings I asked him to fix,
instead of v4 which properly takes care of those issues.
This inter-diffs such that the warnings are now gone.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 9f2bae6616d3..4581aa5ccaba 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -218,7 +218,7 @@ struct bonding { struct slave *primary_slave; bool force_primary; s32 slave_cnt; /* never change this value outside the attach/detach wrappers */ - void (*recv_probe)(struct sk_buff *, struct bonding *, + int (*recv_probe)(struct sk_buff *, struct bonding *, struct slave *); rwlock_t lock; rwlock_t curr_slave_lock; |