evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC

Browse source 
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paul Gortmaker 2014-05-30 15:39:30 -04:00 • committed by David S. Miller
parent 30f38d2fdd
commit 3afc557d77
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/ethernet/broadcom/bcmsysport.c
View file

@ -457,7 +457,7 @@ static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv,
struct sk_buff *skb; struct sk_buff *skb;
unsigned int p_index; unsigned int p_index;
u16 len, status; u16 len, status;
struct rsb *rsb; struct bcm_rsb *rsb;
/* Determine how much we should process since last call */ /* Determine how much we should process since last call */
p_index = rdma_readl(priv, RDMA_PROD_INDEX); 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); RX_BUF_LENGTH, DMA_FROM_DEVICE);
/* Extract the Receive Status Block prepended */ /* 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; len = (rsb->rx_status_len >> DESC_LEN_SHIFT) & DESC_LEN_MASK;
status = (rsb->rx_status_len >> DESC_STATUS_SHIFT) & status = (rsb->rx_status_len >> DESC_STATUS_SHIFT) &
DESC_STATUS_MASK; 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) static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
{ {
struct sk_buff *nskb; struct sk_buff *nskb;
struct tsb *tsb; struct bcm_tsb *tsb;
u32 csum_info; u32 csum_info;
u8 ip_proto; u8 ip_proto;
u16 csum_start; u16 csum_start;
@ -777,7 +777,7 @@ static int bcm_sysport_insert_tsb(struct sk_buff *skb, struct net_device *dev)
skb = nskb; skb = nskb;
} }
tsb = (struct tsb *)skb_push(skb, sizeof(*tsb)); tsb = (struct bcm_tsb *)skb_push(skb, sizeof(*tsb));
/* Zero-out TSB by default */ /* Zero-out TSB by default */
memset(tsb, 0, sizeof(*tsb)); 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; NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
/* Set the needed headroom once and for all */ /* Set the needed headroom once and for all */
BUILD_BUG_ON(sizeof(struct tsb) != 8); BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);
dev->needed_headroom += sizeof(struct tsb); dev->needed_headroom += sizeof(struct bcm_tsb);
/* We are interfaced to a switch which handles the multicast /* We are interfaced to a switch which handles the multicast
* filtering for us, so we do not support programming any * filtering for us, so we do not support programming any

4
drivers/net/ethernet/broadcom/bcmsysport.h
View file

@ -38,7 +38,7 @@
ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD) ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD)
/* Transmit status block */ /* Transmit status block */
struct tsb { struct bcm_tsb {
u32 pcp_dei_vid; u32 pcp_dei_vid;
#define PCP_DEI_MASK 0xf #define PCP_DEI_MASK 0xf
#define VID_SHIFT 4 #define VID_SHIFT 4
@ -56,7 +56,7 @@ struct tsb {
/* Receive status block uses the same /* Receive status block uses the same
* definitions as the DMA descriptor * definitions as the DMA descriptor
*/ */
struct rsb { struct bcm_rsb {
u32 rx_status_len; u32 rx_status_len;
u32 brcm_egress_tag; u32 brcm_egress_tag;
}; };