lkml.org 
[lkml]   [2005]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: Linux 2.4.30-rc2
    Marcelo, David,

    could we merge this patch from Mitch Williams in 2.4.30 ? It fixes a
    stack dump when unloading the bonding module in 802.3ad mode if spinlock
    debugging is turned on.

    Thanks in advance,
    Willy


    diff -urN linux-2.4.29/drivers/net/bonding/bond_main.c linux-2.4.29-bond-2.6.1/drivers/net/bonding/bond_main.c
    --- linux-2.4.29/drivers/net/bonding/bond_main.c Sun Dec 12 12:06:28 2004
    +++ linux-2.4.29-bond-2.6.1/drivers/net/bonding/bond_main.c Sun Feb 6 20:32:49 2005
    @@ -469,6 +469,13 @@
    * * Add support for VLAN hardware acceleration capable slaves.
    * * Add capability to tag self generated packets in ALB/TLB modes.
    * Set version to 2.6.0.
    + * 2004/10/29 - Mitch Williams <mitch.a.williams at intel dot com>
    + * - Fixed bug when unloading module while using 802.3ad. If
    + * spinlock debugging is turned on, this causes a stack dump.
    + * Solution is to move call to dev_remove_pack outside of the
    + * spinlock.
    + * Set version to 2.6.1.
    + *
    */

    //#define BONDING_DEBUG 1
    @@ -3565,14 +3572,14 @@
    {
    struct bonding *bond = bond_dev->priv;

    - write_lock_bh(&bond->lock);
    -
    - bond_mc_list_destroy(bond);
    -
    if (bond->params.mode == BOND_MODE_8023AD) {
    /* Unregister the receive of LACPDUs */
    bond_unregister_lacpdu(bond);
    }
    +
    + write_lock_bh(&bond->lock);
    +
    + bond_mc_list_destroy(bond);

    /* signal timers not to re-arm */
    bond->kill_timers = 1;

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-04-06 13:30    [W:0.059 / U:62.880 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site