lkml.org 
[lkml]   [2011]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: linux-next: build failure after merge of the wireless-next tree
    On Mon, Dec 19, 2011 at 6:57 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    > Hi Luis,
    >
    > On Mon, 19 Dec 2011 18:42:02 -0800 "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> wrote:
    >>
    >> On Mon, Dec 19, 2011 at 6:18 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    >> > Hi John,
    >> >
    >> > After merging the wireless-next tree, today's linux-next build (x86_64
    >> > allmodconfig) failed like this:
    >> >
    >> > drivers/net/wireless/ath/ath9k/dfs.c: In function 'ath9k_postprocess_radar_event':
    >> > drivers/net/wireless/ath/ath9k/dfs.c:73:1: error: 'ATH_DBG_ATH_DBG_DFS' undeclared (first use in this function)
    >> > drivers/net/wireless/ath/ath9k/dfs.c: In function 'ath9k_dfs_process_phyerr':
    >> > drivers/net/wireless/ath/ath9k/dfs.c:166:1: error: 'ATH_DBG_ATH_DBG_DFS' undeclared (first use in this function)
    >> >
    >> > Caused by commit 29942bc12537 ("ath9k: add DFS radar pulse processing").
    >> > ath_dbg prepends ATH_DBG_ to its second argument.
    >> >
    >> > I have used the wireless-next tree from next-20111219 for today.
    >>
    >> Odd, gitweb for wireless-next.git shows only one commit to dfs.c, the
    >> change that introduced it:
    >>
    >> http://git.kernel.org/?p=linux/kernel/git/linville/wireless-next.git;a=history;f=drivers/net/wireless/ath/ath9k/dfs.c;h=e4e84a9e62730f3780a7eda6b4b00d535dd1d428;hb=HEAD
    >>
    >> In that version of the file I see nothing with ATH_DBG_ATH_DBG_DFS. I
    >> also do not see it on wireless-testing.
    >>
    >> mcgrof@tux ~/wireless-testing (git::master)$ git show 29942bc12537 |
    >> grep ATH_DBG_ATH_DBG_DFS
    >
    > Yeah, see my comment above .. search for ATH_DBG_DFS.

    Ah fuck, Joe's patch got in *later* and it did not address changing
    dfs.c. I had raised this as a comment to Joe's patch while we had
    pending patches. It seems this is collateral damage or roadkill.

    commit d2182b69dcb6a68b1ef6070b2efd094e13dea3f1
    Author: Joe Perches <joe@perches.com>
    Date: Thu Dec 15 14:55:53 2011 -0800

    ath: Convert ath_dbg(bar, ATH_DBG_<FOO>, to ath_dbg(bar, FOO

    Add ATH_DBG_ to macros to shorten the uses and
    reduce the line count.

    Coalesce ath_dbg formats.
    Add missing spaces to coalesced formats.
    Add missing newline terminations to ath_dbg formats.
    Align ath_dbg arguments where appropriate.
    Standardize ath_dbg formats without periods.

    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

    Sorry for the trouble but the fix is trivial, I'll sumbit shortly.

    Luis


    \
     
     \ /
      Last update: 2011-12-20 04:27    [W:0.028 / U:1.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site