[PATCH net-next] net: dsa: bcm_sf2: Fix build module

[PATCH net-next] net: dsa: bcm_sf2: Fix build module

[Florian Fainelli]

Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
doing so, we essentially just built this object and no longer bcm_sf2.o.

Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
and bcm_sf2_cfp.o.

Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/dsa/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index da9893478e21..a3c941632217 100644
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_BCM_SF2)	+= bcm_sf2.o
-bcm_sf2-objs			+= bcm_sf2_cfp.o
+obj-$(CONFIG_NET_DSA_BCM_SF2)	+= bcm-sf2.o
+bcm-sf2-objs			:= bcm_sf2.o bcm_sf2_cfp.o
 obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o
 
 obj-y				+= b53/
-- 
2.9.3

Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module

[David Miller]

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 30 Jan 2017 19:17:16 -0800

> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
> doing so, we essentially just built this object and no longer bcm_sf2.o.
> 
> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
> and bcm_sf2_cfp.o.
> 
> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Applied, thanks.

Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module

[Florian Fainelli]

On 01/30/2017 09:32 PM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Mon, 30 Jan 2017 19:17:16 -0800
> 
>> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
>> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
>> doing so, we essentially just built this object and no longer bcm_sf2.o.
>>
>> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
>> and bcm_sf2_cfp.o.
>>
>> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> 
> Applied, thanks.

I don't see it showing up on next-next yet, is it just queued locally?
Thanks!
-- 
Florian

Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module

[David Miller]

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 31 Jan 2017 10:32:38 -0800

> On 01/30/2017 09:32 PM, David Miller wrote:
>> From: Florian Fainelli <f.fainelli@gmail.com>
>> Date: Mon, 30 Jan 2017 19:17:16 -0800
>> 
>>> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
>>> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
>>> doing so, we essentially just built this object and no longer bcm_sf2.o.
>>>
>>> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
>>> and bcm_sf2_cfp.o.
>>>
>>> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
>>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>> 
>> Applied, thanks.
> 
> I don't see it showing up on next-next yet, is it just queued locally?
> Thanks!

The perils of working on different machines during the day :-)

It should be there now, sorry about that.

Re: [PATCH net-next] net: dsa: bcm_sf2: Fix build module

[Florian Fainelli]

On 01/31/2017 10:37 AM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Tue, 31 Jan 2017 10:32:38 -0800
> 
>> On 01/30/2017 09:32 PM, David Miller wrote:
>>> From: Florian Fainelli <f.fainelli@gmail.com>
>>> Date: Mon, 30 Jan 2017 19:17:16 -0800
>>>
>>>> Commit 7318166cacad ("net: dsa: bcm_sf2: Add support for
>>>> ethtool::rxnfc") added a new object to build: bcm_sf2_cfp.o, but in
>>>> doing so, we essentially just built this object and no longer bcm_sf2.o.
>>>>
>>>> Fix this by creating a module named bcm-sf2.ko which links in bcm_sf2.o
>>>> and bcm_sf2_cfp.o.
>>>>
>>>> Fixes: 7318166cacad ("net: dsa: bcm_sf2: Add support for ethtool::rxnfc")
>>>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>>>
>>> Applied, thanks.
>>
>> I don't see it showing up on next-next yet, is it just queued locally?
>> Thanks!
> 
> The perils of working on different machines during the day :-)
> 
> It should be there now, sorry about that.
> 

No worries, thanks for the prompt fix!
-- 
Florian