From c694ed85eab4e7966cd83fca509ce27494e3e296 Mon Sep 17 00:00:00 2001 From: Bob Beers Date: Sat, 16 Oct 2010 18:06:36 -0400 Subject: Staging: cxt1e1: multiple definition of max_mtu fix eliminate multiple definition of max_mtu by renaming with cxt1e1_ prefix, similarly rename max_mru Signed-off-by: Bob Beers Signed-off-by: Greg Kroah-Hartman --- drivers/staging/cxt1e1/musycc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers/staging/cxt1e1/musycc.c') diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c index 12c76a553e0..fc15610f697 100644 --- a/drivers/staging/cxt1e1/musycc.c +++ b/drivers/staging/cxt1e1/musycc.c @@ -99,8 +99,8 @@ extern ci_t *c4_list; extern int drvr_state; extern int log_level; -extern int max_mru; -extern int max_mtu; +extern int cxt1e1_max_mru; +extern int cxt1e1_max_mtu; extern int max_rxdesc_used; extern int max_txdesc_used; extern ci_t *CI; /* dummy pointr to board ZEROE's data - DEBUG @@ -819,7 +819,7 @@ musycc_init_port (mpi_t * pi) MUSYCC_PCD_TX_DRIVEN); /* Message length descriptor */ - pi->regram->mld = __constant_cpu_to_le32 (max_mru | (max_mru << 16)); + pi->regram->mld = __constant_cpu_to_le32 (cxt1e1_max_mru | (cxt1e1_max_mru << 16)); FLUSH_MEM_WRITE (); musycc_serv_req (pi, SR_GROUP_INIT | SR_RX_DIRECTION); @@ -913,17 +913,17 @@ musycc_init (ci_t * ci) /* sanity check settable parameters */ - if (max_mru > 0xffe) + if (cxt1e1_max_mru > 0xffe) { pr_warning("Maximum allowed MRU exceeded, resetting %d to %d.\n", - max_mru, 0xffe); - max_mru = 0xffe; + cxt1e1_max_mru, 0xffe); + cxt1e1_max_mru = 0xffe; } - if (max_mtu > 0xffe) + if (cxt1e1_max_mtu > 0xffe) { pr_warning("Maximum allowed MTU exceeded, resetting %d to %d.\n", - max_mtu, 0xffe); - max_mtu = 0xffe; + cxt1e1_max_mtu, 0xffe); + cxt1e1_max_mtu = 0xffe; } #ifdef SBE_WAN256T3_ENABLE for (i = 0; i < MUSYCC_NPORTS; i++) @@ -1172,7 +1172,7 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan) #endif /*** CONFIG_SBE_WAN256T3_NCOMM ***/ { - if ((m2 = OS_mem_token_alloc (max_mru))) + if ((m2 = OS_mem_token_alloc (cxt1e1_max_mru))) { /* substitute the mbuf+cluster */ md->mem_token = m2; @@ -1204,7 +1204,7 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan) ch->s.rx_length_errors++; } FLUSH_MEM_WRITE (); - status = max_mru; + status = cxt1e1_max_mru; if (ch->p.chan_mode == CFG_CH_PROTO_TRANS) status |= EOBIRQ_ENABLE; md->status = cpu_to_le32 (status); -- cgit v1.2.3-70-g09d2