lkml.org 
[lkml]   [2011]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    SubjectRe: linux-next: build failure after merge of the final tree (wireless tree related)
    Hi Stephen,

    On Wed, May 11, 2011 at 9:10 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    > Hi John,
    >
    > After merging the final tree, today's linux-next build (i386 defconfig)
    > failed like this:
    >
    > net/mac80211/cfg.c: In function 'sta_apply_parameters':
    > net/mac80211/cfg.c:746: error: 'struct sta_info' has no member named 'plink_state'

    Sorry, I just saw this. My apologies. The fixup is valid but I'm
    trying to understand why it is needed.
    ieee80211_vif_is_mesh(&sdata->vif) compiles to 'false' when
    CONFIG_MAC80211_MESH is not defined... wouldn't the compiler remove
    that dead code? (Obviously it did not...)

    Anyway, given that this is necessary, it's probably cleaner to extend
    the #ifdef block to the entire body of the outer if as follows:

    From: Javier Cardona <javier@cozybit.com>
    Date: Wed, 11 May 2011 21:30:17 -0700
    Subject: [PATCH] mac80211: fixup access to conditionally defined struct member

    Signed-off-by: Javier Cardona <javier@cozybit.com>
    ---
    net/mac80211/cfg.c | 2 ++
    1 files changed, 2 insertions(+), 0 deletions(-)

    diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
    index a2ff474..d104c1e 100644
    --- a/net/mac80211/cfg.c
    +++ b/net/mac80211/cfg.c
    @@ -738,6 +738,7 @@ static void sta_apply_parameters(struct
    ieee80211_local *local,
    &sta->sta.ht_cap);

    if (ieee80211_vif_is_mesh(&sdata->vif)) {
    +#ifdef CONFIG_MAC80211_MESH
    if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED)
    switch (params->plink_state) {
    case PLINK_LISTEN:
    @@ -759,6 +760,7 @@ static void sta_apply_parameters(struct
    ieee80211_local *local,
    break;
    }
    }
    +#endif
    }

    static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
    --
    1.7.2.1

    > Cause by commit 9c3990aaec0a ("nl80211: Let userspace drive the peer link
    > management states").  plink_state is only available in sta_info if
    > CONFIG_MAC80211_MESH is set.
    >
    > I applied the following patch for today (which my not be correct).
    >
    > From: Stephen Rothwell <sfr@canb.auug.org.au>
    > Date: Thu, 12 May 2011 14:06:31 +1000
    > Subject: [PATCH] nl80211: fix for reference to sta_info -> plink_state
    >
    > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    > ---
    >  net/mac80211/cfg.c |    2 ++
    >  1 files changed, 2 insertions(+), 0 deletions(-)
    >
    > diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
    > index a2ff474..e090012 100644
    > --- a/net/mac80211/cfg.c
    > +++ b/net/mac80211/cfg.c
    > @@ -743,7 +743,9 @@ static void sta_apply_parameters(struct ieee80211_local *local,
    >                        case PLINK_LISTEN:
    >                        case PLINK_ESTAB:
    >                        case PLINK_BLOCKED:
    > +#ifdef CONFIG_MAC80211_MESH
    >                                sta->plink_state = params->plink_state;
    > +#endif
    >                                break;
    >                        default:
    >                                /*  nothing  */
    > --
    > 1.7.5.1
    >
    > --
    > Cheers,
    > Stephen Rothwell                    sfr@canb.auug.org.au
    > http://www.canb.auug.org.au/~sfr/
    >



    --
    Javier Cardona
    cozybit Inc.
    http://www.cozybit.com
    --
    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: 2011-05-12 06:41    [W:0.028 / U:2.368 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site