Skip to content

Commit c312b8b

Browse files
committed
Revert "staging: octeon: remove typedef in structs cvmx_pip_port_status_t and cvmx_pko_port_status_t"
This reverts commit b33a296. The patch series that removed typedefs from the octeon driver was not actually built properly, and broke the build (it's hard to test-build this driver for some reason.) Remove them all at this point in time to make sure the build works properly. Link: https://lore.kernel.org/r/32e9ad3c-191e-4dd1-b1cc-07f7b93c3f28@roeck-us.net Reported-by: Guenter Roeck <linux@roeck-us.net> Cc: Oliver Crumrine <ozlinux@hotmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 41196b0 commit c312b8b

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/staging/octeon/ethernet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ EXPORT_SYMBOL(cvm_oct_free_work);
201201
*/
202202
static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
203203
{
204-
struct cvmx_pip_port_status rx_status;
205-
struct cvmx_pko_port_status tx_status;
204+
cvmx_pip_port_status_t rx_status;
205+
cvmx_pko_port_status_t tx_status;
206206
struct octeon_ethernet *priv = netdev_priv(dev);
207207

208208
if (priv->port < CVMX_PIP_NUM_INPUT_PORTS) {

drivers/staging/octeon/octeon-stubs.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ union cvmx_ipd_sub_port_qos_cnt {
384384
} s;
385385
};
386386

387-
struct cvmx_pip_port_status {
387+
typedef struct {
388388
uint32_t dropped_octets;
389389
uint32_t dropped_packets;
390390
uint32_t pci_raw_packets;
@@ -407,13 +407,13 @@ struct cvmx_pip_port_status {
407407
uint32_t inb_packets;
408408
uint64_t inb_octets;
409409
uint16_t inb_errors;
410-
};
410+
} cvmx_pip_port_status_t;
411411

412-
struct cvmx_pko_port_status {
412+
typedef struct {
413413
uint32_t packets;
414414
uint64_t octets;
415415
uint64_t doorbell;
416-
};
416+
} cvmx_pko_port_status_t;
417417

418418
union cvmx_pip_frm_len_chkx {
419419
uint64_t u64;
@@ -1258,11 +1258,11 @@ static inline int octeon_is_simulation(void)
12581258
}
12591259

12601260
static inline void cvmx_pip_get_port_status(uint64_t port_num, uint64_t clear,
1261-
struct cvmx_pip_port_status *status)
1261+
cvmx_pip_port_status_t *status)
12621262
{ }
12631263

12641264
static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear,
1265-
struct cvmx_pko_port_status *status)
1265+
cvmx_pko_port_status_t *status)
12661266
{ }
12671267

12681268
static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int

0 commit comments

Comments
 (0)