diff --git a/drivers/staging/sbe-2t3e3/2t3e3.h b/drivers/staging/sbe-2t3e3/2t3e3.h index 3577fad61c5e88d03c06d8460e48cb8b36f2f5bb..f528eaa074509a2c7c773ebd3dec1c574854d773 100644 --- a/drivers/staging/sbe-2t3e3/2t3e3.h +++ b/drivers/staging/sbe-2t3e3/2t3e3.h @@ -648,12 +648,12 @@ struct t3e3_rx_desc { /*********************/ -typedef struct { +struct t3e3_tx_desc { u32 tdes0; u32 tdes1; u32 tdes2; u32 tdes3; -} t3e3_tx_desc_t; +}; #define SBE_2T3E3_TX_DESC_RING_SIZE 256 @@ -728,7 +728,7 @@ struct channel { u32 rx_ring_current_read; /* transmit chain/ring */ - t3e3_tx_desc_t *tx_ring; + struct t3e3_tx_desc *tx_ring; struct sk_buff *tx_data[SBE_2T3E3_TX_DESC_RING_SIZE]; u32 tx_ring_current_read; u32 tx_ring_current_write; diff --git a/drivers/staging/sbe-2t3e3/dc.c b/drivers/staging/sbe-2t3e3/dc.c index 0d60bc77f91a94fa93a9abc5f891b66c357b1c29..02510f67ac4585f87c444bf1a583ac543b626562 100644 --- a/drivers/staging/sbe-2t3e3/dc.c +++ b/drivers/staging/sbe-2t3e3/dc.c @@ -322,7 +322,7 @@ static int dc_init_descriptor_list(struct channel *sc) if (sc->ether.tx_ring == NULL) sc->ether.tx_ring = kcalloc(SBE_2T3E3_TX_DESC_RING_SIZE, - sizeof(t3e3_tx_desc_t), GFP_KERNEL); + sizeof(struct t3e3_tx_desc), GFP_KERNEL); if (sc->ether.tx_ring == NULL) { kfree(sc->ether.rx_ring); sc->ether.rx_ring = NULL; diff --git a/drivers/staging/sbe-2t3e3/intr.c b/drivers/staging/sbe-2t3e3/intr.c index a346c516bcc32bb6ce59879ad9acf9f6f966445b..1bf74b788008500c4465d5709319940095db8e59 100644 --- a/drivers/staging/sbe-2t3e3/intr.c +++ b/drivers/staging/sbe-2t3e3/intr.c @@ -292,7 +292,7 @@ void dc_intr_tx(struct channel *sc) { u32 current_read, current_write; u32 last_segment, error; - t3e3_tx_desc_t *current_desc; + struct t3e3_tx_desc *current_desc; spin_lock(&sc->ether.tx_lock);