* [PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC @ 2014-05-30 14:02 Paul Gortmaker 2014-05-30 17:04 ` Florian Fainelli 2014-05-30 19:39 ` [PATCH-next v2] " Paul Gortmaker 0 siblings, 2 replies; 6+ messages in thread From: Paul Gortmaker @ 2014-05-30 14:02 UTC (permalink / raw) To: netdev; +Cc: David S. Miller, Florian Fainelli, Paul Gortmaker 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> 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC 2014-05-30 14:02 [PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC Paul Gortmaker @ 2014-05-30 17:04 ` Florian Fainelli 2014-05-30 18:21 ` Paul Gortmaker 2014-05-30 19:39 ` [PATCH-next v2] " Paul Gortmaker 1 sibling, 1 reply; 6+ messages in thread From: Florian Fainelli @ 2014-05-30 17:04 UTC (permalink / raw) To: Paul Gortmaker; +Cc: netdev, David S. Miller 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 > -- Florian ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC 2014-05-30 17:04 ` Florian Fainelli @ 2014-05-30 18:21 ` Paul Gortmaker 2014-05-30 18:36 ` Florian Fainelli 0 siblings, 1 reply; 6+ messages in thread From: Paul Gortmaker @ 2014-05-30 18:21 UTC (permalink / raw) To: Florian Fainelli; +Cc: netdev, David S. Miller 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 >> > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC 2014-05-30 18:21 ` Paul Gortmaker @ 2014-05-30 18:36 ` Florian Fainelli 0 siblings, 0 replies; 6+ messages in thread From: Florian Fainelli @ 2014-05-30 18:36 UTC (permalink / raw) To: Paul Gortmaker; +Cc: netdev, David S. Miller 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 >>> >> >> >> -- Florian ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH-next v2] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC 2014-05-30 14:02 [PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC Paul Gortmaker 2014-05-30 17:04 ` Florian Fainelli @ 2014-05-30 19:39 ` Paul Gortmaker 2014-06-02 22:01 ` Florian Fainelli 1 sibling, 1 reply; 6+ messages in thread From: Paul Gortmaker @ 2014-05-30 19:39 UTC (permalink / raw) To: netdev; +Cc: Florian Fainelli, David S. Miller, Paul Gortmaker 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. For consistency, we also change struct rsb to struct bcm_rsb, so the Rx/Tx symmetry is maintained. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- [v2: also change rsb --> bcm_rsb for Rx/Tx consistency] drivers/net/ethernet/broadcom/bcmsysport.c | 12 ++++++------ drivers/net/ethernet/broadcom/bcmsysport.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index dc708a888f80..25982b02f0ea 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -457,7 +457,7 @@ static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv, struct sk_buff *skb; unsigned int p_index; u16 len, status; - struct rsb *rsb; + struct bcm_rsb *rsb; /* Determine how much we should process since last call */ p_index = rdma_readl(priv, RDMA_PROD_INDEX); @@ -482,7 +482,7 @@ static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv, RX_BUF_LENGTH, DMA_FROM_DEVICE); /* Extract the Receive Status Block prepended */ - rsb = (struct rsb *)skb->data; + rsb = (struct bcm_rsb *)skb->data; len = (rsb->rx_status_len >> DESC_LEN_SHIFT) & DESC_LEN_MASK; status = (rsb->rx_status_len >> DESC_STATUS_SHIFT) & DESC_STATUS_MASK; @@ -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)); @@ -1584,8 +1584,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 73fd04a94797..281c08246037 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 @@ -56,7 +56,7 @@ struct tsb { /* Receive status block uses the same * definitions as the DMA descriptor */ -struct rsb { +struct bcm_rsb { u32 rx_status_len; u32 brcm_egress_tag; }; -- 1.9.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH-next v2] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC 2014-05-30 19:39 ` [PATCH-next v2] " Paul Gortmaker @ 2014-06-02 22:01 ` Florian Fainelli 0 siblings, 0 replies; 6+ messages in thread From: Florian Fainelli @ 2014-06-02 22:01 UTC (permalink / raw) To: Paul Gortmaker; +Cc: netdev, David S. Miller 2014-05-30 12:39 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. For consistency, we also > change struct rsb to struct bcm_rsb, so the Rx/Tx symmetry is > maintained. > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> > --- > > [v2: also change rsb --> bcm_rsb for Rx/Tx consistency] > > drivers/net/ethernet/broadcom/bcmsysport.c | 12 ++++++------ > drivers/net/ethernet/broadcom/bcmsysport.h | 4 ++-- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c > index dc708a888f80..25982b02f0ea 100644 > --- a/drivers/net/ethernet/broadcom/bcmsysport.c > +++ b/drivers/net/ethernet/broadcom/bcmsysport.c > @@ -457,7 +457,7 @@ static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv, > struct sk_buff *skb; > unsigned int p_index; > u16 len, status; > - struct rsb *rsb; > + struct bcm_rsb *rsb; > > /* Determine how much we should process since last call */ > p_index = rdma_readl(priv, RDMA_PROD_INDEX); > @@ -482,7 +482,7 @@ static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv, > RX_BUF_LENGTH, DMA_FROM_DEVICE); > > /* Extract the Receive Status Block prepended */ > - rsb = (struct rsb *)skb->data; > + rsb = (struct bcm_rsb *)skb->data; > len = (rsb->rx_status_len >> DESC_LEN_SHIFT) & DESC_LEN_MASK; > status = (rsb->rx_status_len >> DESC_STATUS_SHIFT) & > DESC_STATUS_MASK; > @@ -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)); > > @@ -1584,8 +1584,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 73fd04a94797..281c08246037 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 > @@ -56,7 +56,7 @@ struct tsb { > /* Receive status block uses the same > * definitions as the DMA descriptor > */ > -struct rsb { > +struct bcm_rsb { > u32 rx_status_len; > u32 brcm_egress_tag; > }; > -- > 1.9.3 > -- Florian ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-02 22:02 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-05-30 14:02 [PATCH-next] drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC Paul Gortmaker 2014-05-30 17:04 ` Florian Fainelli 2014-05-30 18:21 ` Paul Gortmaker 2014-05-30 18:36 ` Florian Fainelli 2014-05-30 19:39 ` [PATCH-next v2] " Paul Gortmaker 2014-06-02 22:01 ` Florian Fainelli
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).