lkml.org 
[lkml]   [2009]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the net tree with the wireless-current tree
    Hi David,

    Today's linux-next merge of the net tree got a conflict in
    drivers/net/wireless/iwmc3200wifi/netdev.c between commit
    513a2396d8e8327aff1ce50bea3fb4f16ff3455b ("iwmc3200wifi: fix NULL pointer
    dereference in iwm_if_free") from the wireless-current tree and commit
    3549716484a95fd16f7fcf8b68699bd4c803b382 ("iwmc3200wifi: cache keys when
    interface is down") from the net tree.

    Just context changes. I fixed it up (see below) and can carry the fix
    as necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc drivers/net/wireless/iwmc3200wifi/netdev.c
    index aea5ccf,e94e969..0000000
    --- a/drivers/net/wireless/iwmc3200wifi/netdev.c
    +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
    @@@ -151,8 -156,10 +156,10 @@@ void iwm_if_free(struct iwm_priv *iwm
    return;

    free_netdev(iwm_to_ndev(iwm));
    - iwm_wdev_free(iwm);
    iwm_priv_deinit(iwm);
    + iwm_wdev_free(iwm);
    + kfree(iwm->umac_profile);
    + iwm->umac_profile = NULL;
    }

    int iwm_if_add(struct iwm_priv *iwm)


    \
     
     \ /
      Last update: 2009-07-22 04:03    [W:0.039 / U:0.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site