diff mbox

[PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC

Message ID 1401458527-26513-1-git-send-email-paul.gortmaker@windriver.com
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Paul Gortmaker May 30, 2014, 2:02 p.m. UTC 
To fix:

  CC      drivers/net/ethernet/broadcom/bcmsysport.o
In file included from drivers/net/ethernet/broadcom/bcmsysport.c:28:0:
drivers/net/ethernet/broadcom/bcmsysport.h:41:8: error: redefinition of 'struct tsb'
arch/sparc/include/asm/mmu_64.h:65:8: note: originally defined here
make[1]: *** [drivers/net/ethernet/broadcom/bcmsysport.o] Error 1

we change struct tsb to struct bcm_tsb in the broadcom driver in
order to avoid the namespace collision.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Comments

Florian Fainelli May 30, 2014, 5:04 p.m. UTC | #1 
Hi Paul,

2014-05-30 7:02 GMT-07:00 Paul Gortmaker <paul.gortmaker@windriver.com>:
> To fix:
>
>   CC      drivers/net/ethernet/broadcom/bcmsysport.o
> In file included from drivers/net/ethernet/broadcom/bcmsysport.c:28:0:
> drivers/net/ethernet/broadcom/bcmsysport.h:41:8: error: redefinition of 'struct tsb'
> arch/sparc/include/asm/mmu_64.h:65:8: note: originally defined here
> make[1]: *** [drivers/net/ethernet/broadcom/bcmsysport.o] Error 1
>
> we change struct tsb to struct bcm_tsb in the broadcom driver in
> order to avoid the namespace collision.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

For consistency, we might want to rename 'struct tsb' to 'struct
bcm_tsb', thanks for catching this.

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

>
> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
> index 4dc8d1e9829b..0d466c134a9e 100644
> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
> @@ -759,7 +759,7 @@ static irqreturn_t bcm_sysport_tx_isr(int irq, void *dev_id)
>  static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
>  {
>         struct sk_buff *nskb;
> -       struct tsb *tsb;
> +       struct bcm_tsb *tsb;
>         u32 csum_info;
>         u8 ip_proto;
>         u16 csum_start;
> @@ -777,7 +777,7 @@ static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
>                 skb = nskb;
>         }
>
> -       tsb = (struct tsb *)skb_push(skb, sizeof(*tsb));
> +       tsb = (struct bcm_tsb *)skb_push(skb, sizeof(*tsb));
>         /* Zero-out TSB by default */
>         memset(tsb, 0, sizeof(*tsb));
>
> @@ -1549,8 +1549,8 @@ static int bcm_sysport_probe(struct platform_device *pdev)
>                                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
>
>         /* Set the needed headroom once and for all */
> -       BUILD_BUG_ON(sizeof(struct tsb) != 8);
> -       dev->needed_headroom += sizeof(struct tsb);
> +       BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);
> +       dev->needed_headroom += sizeof(struct bcm_tsb);
>
>         /* We are interfaced to a switch which handles the multicast
>          * filtering for us, so we do not support programming any
> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
> index a0441e7c83cd..72a103c096f2 100644
> --- a/drivers/net/ethernet/broadcom/bcmsysport.h
> +++ b/drivers/net/ethernet/broadcom/bcmsysport.h
> @@ -38,7 +38,7 @@
>                                  ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD)
>
>  /* Transmit status block */
> -struct tsb {
> +struct bcm_tsb {
>         u32 pcp_dei_vid;
>  #define PCP_DEI_MASK           0xf
>  #define VID_SHIFT              4
> --
> 1.9.3
>
Paul Gortmaker May 30, 2014, 6:21 p.m. UTC | #2 
On 14-05-30 01:04 PM, Florian Fainelli wrote:
> Hi Paul,
> 
> 2014-05-30 7:02 GMT-07:00 Paul Gortmaker <paul.gortmaker@windriver.com>:
>> To fix:
>>
>>   CC      drivers/net/ethernet/broadcom/bcmsysport.o
>> In file included from drivers/net/ethernet/broadcom/bcmsysport.c:28:0:
>> drivers/net/ethernet/broadcom/bcmsysport.h:41:8: error: redefinition of 'struct tsb'
>> arch/sparc/include/asm/mmu_64.h:65:8: note: originally defined here
>> make[1]: *** [drivers/net/ethernet/broadcom/bcmsysport.o] Error 1
>>
>> we change struct tsb to struct bcm_tsb in the broadcom driver in
>> order to avoid the namespace collision.
>>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> For consistency, we might want to rename 'struct tsb' to 'struct
> bcm_tsb', thanks for catching this.

The above is what I did ; I assume however you meant "struct rsb"
to "struct bcm_rsb", which does make sense for consistency.  I'll
send a v2 with that incorporated.

Thanks,
Paul.
--

> 
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> 
>>
>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
>> index 4dc8d1e9829b..0d466c134a9e 100644
>> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
>> @@ -759,7 +759,7 @@ static irqreturn_t bcm_sysport_tx_isr(int irq, void *dev_id)
>>  static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
>>  {
>>         struct sk_buff *nskb;
>> -       struct tsb *tsb;
>> +       struct bcm_tsb *tsb;
>>         u32 csum_info;
>>         u8 ip_proto;
>>         u16 csum_start;
>> @@ -777,7 +777,7 @@ static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
>>                 skb = nskb;
>>         }
>>
>> -       tsb = (struct tsb *)skb_push(skb, sizeof(*tsb));
>> +       tsb = (struct bcm_tsb *)skb_push(skb, sizeof(*tsb));
>>         /* Zero-out TSB by default */
>>         memset(tsb, 0, sizeof(*tsb));
>>
>> @@ -1549,8 +1549,8 @@ static int bcm_sysport_probe(struct platform_device *pdev)
>>                                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
>>
>>         /* Set the needed headroom once and for all */
>> -       BUILD_BUG_ON(sizeof(struct tsb) != 8);
>> -       dev->needed_headroom += sizeof(struct tsb);
>> +       BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);
>> +       dev->needed_headroom += sizeof(struct bcm_tsb);
>>
>>         /* We are interfaced to a switch which handles the multicast
>>          * filtering for us, so we do not support programming any
>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
>> index a0441e7c83cd..72a103c096f2 100644
>> --- a/drivers/net/ethernet/broadcom/bcmsysport.h
>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.h
>> @@ -38,7 +38,7 @@
>>                                  ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD)
>>
>>  /* Transmit status block */
>> -struct tsb {
>> +struct bcm_tsb {
>>         u32 pcp_dei_vid;
>>  #define PCP_DEI_MASK           0xf
>>  #define VID_SHIFT              4
>> --
>> 1.9.3
>>
> 
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Florian Fainelli May 30, 2014, 6:36 p.m. UTC | #3 
2014-05-30 11:21 GMT-07:00 Paul Gortmaker <paul.gortmaker@windriver.com>:
> On 14-05-30 01:04 PM, Florian Fainelli wrote:
>> Hi Paul,
>>
>> 2014-05-30 7:02 GMT-07:00 Paul Gortmaker <paul.gortmaker@windriver.com>:
>>> To fix:
>>>
>>>   CC      drivers/net/ethernet/broadcom/bcmsysport.o
>>> In file included from drivers/net/ethernet/broadcom/bcmsysport.c:28:0:
>>> drivers/net/ethernet/broadcom/bcmsysport.h:41:8: error: redefinition of 'struct tsb'
>>> arch/sparc/include/asm/mmu_64.h:65:8: note: originally defined here
>>> make[1]: *** [drivers/net/ethernet/broadcom/bcmsysport.o] Error 1
>>>
>>> we change struct tsb to struct bcm_tsb in the broadcom driver in
>>> order to avoid the namespace collision.
>>>
>>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>>
>> For consistency, we might want to rename 'struct tsb' to 'struct
>> bcm_tsb', thanks for catching this.
>
> The above is what I did ; I assume however you meant "struct rsb"
> to "struct bcm_rsb", which does make sense for consistency.  I'll
> send a v2 with that incorporated.

I do mean 'struct rsb', thanks!

>
> Thanks,
> Paul.
> --
>
>>
>> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
>>
>>>
>>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
>>> index 4dc8d1e9829b..0d466c134a9e 100644
>>> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
>>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
>>> @@ -759,7 +759,7 @@ static irqreturn_t bcm_sysport_tx_isr(int irq, void *dev_id)
>>>  static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
>>>  {
>>>         struct sk_buff *nskb;
>>> -       struct tsb *tsb;
>>> +       struct bcm_tsb *tsb;
>>>         u32 csum_info;
>>>         u8 ip_proto;
>>>         u16 csum_start;
>>> @@ -777,7 +777,7 @@ static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
>>>                 skb = nskb;
>>>         }
>>>
>>> -       tsb = (struct tsb *)skb_push(skb, sizeof(*tsb));
>>> +       tsb = (struct bcm_tsb *)skb_push(skb, sizeof(*tsb));
>>>         /* Zero-out TSB by default */
>>>         memset(tsb, 0, sizeof(*tsb));
>>>
>>> @@ -1549,8 +1549,8 @@ static int bcm_sysport_probe(struct platform_device *pdev)
>>>                                 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
>>>
>>>         /* Set the needed headroom once and for all */
>>> -       BUILD_BUG_ON(sizeof(struct tsb) != 8);
>>> -       dev->needed_headroom += sizeof(struct tsb);
>>> +       BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);
>>> +       dev->needed_headroom += sizeof(struct bcm_tsb);
>>>
>>>         /* We are interfaced to a switch which handles the multicast
>>>          * filtering for us, so we do not support programming any
>>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
>>> index a0441e7c83cd..72a103c096f2 100644
>>> --- a/drivers/net/ethernet/broadcom/bcmsysport.h
>>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.h
>>> @@ -38,7 +38,7 @@
>>>                                  ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD)
>>>
>>>  /* Transmit status block */
>>> -struct tsb {
>>> +struct bcm_tsb {
>>>         u32 pcp_dei_vid;
>>>  #define PCP_DEI_MASK           0xf
>>>  #define VID_SHIFT              4
>>> --
>>> 1.9.3
>>>
>>
>>
>>
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 4dc8d1e9829b..0d466c134a9e 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -759,7 +759,7 @@  static irqreturn_t bcm_sysport_tx_isr(int irq, void *dev_id)
 static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
 {
 	struct sk_buff *nskb;
-	struct tsb *tsb;
+	struct bcm_tsb *tsb;
 	u32 csum_info;
 	u8 ip_proto;
 	u16 csum_start;
@@ -777,7 +777,7 @@  static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
 		skb = nskb;
 	}
 
-	tsb = (struct tsb *)skb_push(skb, sizeof(*tsb));
+	tsb = (struct bcm_tsb *)skb_push(skb, sizeof(*tsb));
 	/* Zero-out TSB by default */
 	memset(tsb, 0, sizeof(*tsb));
 
@@ -1549,8 +1549,8 @@  static int bcm_sysport_probe(struct platform_device *pdev)
 				NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
 
 	/* Set the needed headroom once and for all */
-	BUILD_BUG_ON(sizeof(struct tsb) != 8);
-	dev->needed_headroom += sizeof(struct tsb);
+	BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);
+	dev->needed_headroom += sizeof(struct bcm_tsb);
 
 	/* We are interfaced to a switch which handles the multicast
 	 * filtering for us, so we do not support programming any
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
index a0441e7c83cd..72a103c096f2 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.h
+++ b/drivers/net/ethernet/broadcom/bcmsysport.h
@@ -38,7 +38,7 @@ 
 				 ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD)
 
 /* Transmit status block */
-struct tsb {
+struct bcm_tsb {
 	u32 pcp_dei_vid;
 #define PCP_DEI_MASK		0xf
 #define VID_SHIFT		4