netdev - Re: pull request: wireless-next-2.6 2011-02-22

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20110304184050.GC9866@tuxdriver.com>
Date:	Fri, 4 Mar 2011 13:40:50 -0500
From:	"John W. Linville" <linville@...driver.com>
To:	Shan Wei <shanwei@...fujitsu.com>
Cc:	Larry.Finger@...inger.net, davem@...emloft.net,
	linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: pull request: wireless-next-2.6 2011-02-22

On Fri, Mar 04, 2011 at 12:35:58PM +0800, Shan Wei wrote:
> John W. Linville wrote, at 02/23/2011 05:52 AM:
> > Please let me know if there are problems!
> 
> Fail to compile with attached config under net-next tree.
>  
> ======Error Begin================================================================
> drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_sw_chnl':
> /data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/../rtl8192c/phy_common.c:803: multiple definition of `rtl92c_phy_sw_chnl'
> drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:/data2/net-next-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/../rtl8192c/phy_common.c:803: first defined here
> drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_h2c_cmd':

This is already fixed in wireless-next-2.6:

commit 1472d3a87586eb7529d1d85f7c888055650b7208
Author: Larry Finger <Larry.Finger@...inger.net>
Date:   Wed Feb 23 10:24:58 2011 -0600

    rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig buil
    
    As noted by Stephan Rothwell, an allyesconfig build fails since rtl8192cu
    was merged with failures such as:
    
    drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_phy_s
    (.opd+0xf30): multiple definition of `rtl92c_phy_sw_chnl'
    drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0xb70): first define
    drivers/net/wireless/rtlwifi/rtl8192cu/built-in.o: In function `rtl92c_fill_
    (.opd+0x288): multiple definition of `rtl92c_fill_h2c_cmd'
    drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.opd+0x288): first define
    
    These are caused because the code shared between rtl8192ce and rtl8192cu
    is included in both drivers. This has been fixed by creating a new modue tha
    contains the shared code.
    
    Signed-off-by: Larry Finger <Larry.Finger@...inger.net>
    Signed-off-by: John W. Linville <linville@...driver.com>

It will be in my next pull request to Dave.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@...driver.com			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html