2007-10-24 16:49:55

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] bonding/bond_main.c: fix cut'n'paste error

This patch fixes a cut'n'paste error in
commit 1b76b31693d4a6088dec104ff6a6ead54081a3c2.

Signed-off-by: Adrian Bunk <[email protected]>

---
4888742f8d7fe3b97fbc2911aa46375048173d01
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e5fab4b..6937ef0 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3682,7 +3682,7 @@ static int bond_open(struct net_device *bond_dev)
}

if (bond->params.mode == BOND_MODE_8023AD) {
- INIT_DELAYED_WORK(&bond->ad_work, bond_alb_monitor);
+ INIT_DELAYED_WORK(&bond->ad_work, bond_3ad_state_machine_handler);
queue_delayed_work(bond->wq, &bond->ad_work, 0);
/* register to receive LACPDUs */
bond_register_lacpdu(bond);


2007-10-24 22:51:30

by Jay Vosburgh

[permalink] [raw]
Subject: Re: [2.6 patch] bonding/bond_main.c: fix cut'n'paste error



Adrian Bunk <[email protected]> wrote:
>This patch fixes a cut'n'paste error in
>commit 1b76b31693d4a6088dec104ff6a6ead54081a3c2.
>
>Signed-off-by: Adrian Bunk <[email protected]>

Please apply.

-J

Acked-by: Jay Vosburgh <[email protected]>


>---
>4888742f8d7fe3b97fbc2911aa46375048173d01
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index e5fab4b..6937ef0 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -3682,7 +3682,7 @@ static int bond_open(struct net_device *bond_dev)
> }
>
> if (bond->params.mode == BOND_MODE_8023AD) {
>- INIT_DELAYED_WORK(&bond->ad_work, bond_alb_monitor);
>+ INIT_DELAYED_WORK(&bond->ad_work, bond_3ad_state_machine_handler);
> queue_delayed_work(bond->wq, &bond->ad_work, 0);
> /* register to receive LACPDUs */
> bond_register_lacpdu(bond);
>