aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/octeon/ethernet.c4
-rw-r--r--drivers/staging/octeon/octeon-stubs.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 8e1f4b987a25..023b107e077a 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -201,8 +201,8 @@ EXPORT_SYMBOL(cvm_oct_free_work);
*/
static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
{
- struct cvmx_pip_port_status rx_status;
- struct cvmx_pko_port_status tx_status;
+ cvmx_pip_port_status_t rx_status;
+ cvmx_pko_port_status_t tx_status;
struct octeon_ethernet *priv = netdev_priv(dev);
if (priv->port < CVMX_PIP_NUM_INPUT_PORTS) {
diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon/octeon-stubs.h
index 579c755cfdc0..b9852994882b 100644
--- a/drivers/staging/octeon/octeon-stubs.h
+++ b/drivers/staging/octeon/octeon-stubs.h
@@ -384,7 +384,7 @@ union cvmx_ipd_sub_port_qos_cnt {
} s;
};
-struct cvmx_pip_port_status {
+typedef struct {
uint32_t dropped_octets;
uint32_t dropped_packets;
uint32_t pci_raw_packets;
@@ -407,13 +407,13 @@ struct cvmx_pip_port_status {
uint32_t inb_packets;
uint64_t inb_octets;
uint16_t inb_errors;
-};
+} cvmx_pip_port_status_t;
-struct cvmx_pko_port_status {
+typedef struct {
uint32_t packets;
uint64_t octets;
uint64_t doorbell;
-};
+} cvmx_pko_port_status_t;
union cvmx_pip_frm_len_chkx {
uint64_t u64;
@@ -1258,11 +1258,11 @@ static inline int octeon_is_simulation(void)
}
static inline void cvmx_pip_get_port_status(uint64_t port_num, uint64_t clear,
- struct cvmx_pip_port_status *status)
+ cvmx_pip_port_status_t *status)
{ }
static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear,
- struct cvmx_pko_port_status *status)
+ cvmx_pko_port_status_t *status)
{ }
static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int