projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
081b1b1
)
bonding:delete a dereference before check
author
Peter Pan(潘卫平)
<
[email protected]
>
Mon, 13 Jun 2011 04:30:10 +0000
(
04:30
+0000)
committer
David S. Miller
<
[email protected]
>
Mon, 13 Jun 2011 22:29:41 +0000
(18:29 -0400)
Dan Carpenter found that there was a dereference before a check,
added in
56d00c677de0
(bonding:delete lacp_fast from ad_bond_info).
Signed-off-by: Weiping Pan <
[email protected]
>
Signed-off-by: Jay Vosburgh <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/bonding/bond_3ad.c
patch
|
blob
|
history
diff --git
a/drivers/net/bonding/bond_3ad.c
b/drivers/net/bonding/bond_3ad.c
index 6122725fc7c26bae142a3c6f288540a1ea854883..77da2e8496237532e7e70141253112cbf29fc441 100644
(file)
--- a/
drivers/net/bonding/bond_3ad.c
+++ b/
drivers/net/bonding/bond_3ad.c
@@
-1900,7
+1900,6
@@
void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
int bond_3ad_bind_slave(struct slave *slave)
{
struct bonding *bond = bond_get_bond_by_slave(slave);
- int lacp_fast = bond->params.lacp_fast;
struct port *port;
struct aggregator *aggregator;
@@
-1916,7
+1915,7
@@
int bond_3ad_bind_slave(struct slave *slave)
// port initialization
port = &(SLAVE_AD_INFO(slave).port);
- ad_initialize_port(port, lacp_fast);
+ ad_initialize_port(port,
bond->params.
lacp_fast);
port->slave = slave;
port->actor_port_number = SLAVE_AD_INFO(slave).id;