lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[047/146] bonding: 802.3ad - fix agg_device_up
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------


    From: Jiri Bohac <jbohac@suse.cz>

    [ Upstream commit 2430af8b7fa37ac0be102c77f9dc6ee669d24ba9 ]

    The slave member of struct aggregator does not necessarily point
    to a slave which is part of the aggregator. It points to the
    slave structure containing the aggregator structure, while
    completely different slaves (or no slaves at all) may be part of
    the aggregator.

    The agg_device_up() function wrongly uses agg->slave to find the state
    of the aggregator. Use agg->lag_ports->slave instead. The bug has
    been introduced by commit 4cd6fe1c6483cde93e2ec91f58b7af9c9eea51ad
    ("bonding: fix link down handling in 802.3ad mode").

    Signed-off-by: Jiri Bohac <jbohac@suse.cz>
    Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/net/bonding/bond_3ad.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/net/bonding/bond_3ad.c
    +++ b/drivers/net/bonding/bond_3ad.c
    @@ -1482,8 +1482,11 @@ static struct aggregator *ad_agg_selecti

    static int agg_device_up(const struct aggregator *agg)
    {
    - return (netif_running(agg->slave->dev) &&
    - netif_carrier_ok(agg->slave->dev));
    + struct port *port = agg->lag_ports;
    + if (!port)
    + return 0;
    + return (netif_running(port->slave->dev) &&
    + netif_carrier_ok(port->slave->dev));
    }

    /**



    \
     
     \ /
      Last update: 2011-06-01 10:13    [W:0.020 / U:122.308 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site