diff options
author | Bob Beers <bob.beers@gmail.com> | 2010-10-16 18:06:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-19 13:12:14 -0400 |
commit | c694ed85eab4e7966cd83fca509ce27494e3e296 (patch) | |
tree | cd3d0b4e76555620847ecdf496212c959a94e745 /drivers/staging/cxt1e1 | |
parent | b3495cebaaa64c9e6df9ab663dfb75e86a08f9ce (diff) |
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 <bbeers@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/cxt1e1')
-rw-r--r-- | drivers/staging/cxt1e1/linux.c | 20 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/musycc.c | 22 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/pmcc4_drv.c | 14 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/sbeproc.c | 8 |
4 files changed, 32 insertions, 32 deletions
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index eb0f4bdf627..c7930287e3d 100644 --- a/drivers/staging/cxt1e1/linux.c +++ b/drivers/staging/cxt1e1/linux.c | |||
@@ -112,13 +112,13 @@ int log_level = LOG_ERROR; | |||
112 | int log_level_default = LOG_ERROR; | 112 | int log_level_default = LOG_ERROR; |
113 | module_param(log_level, int, 0444); | 113 | module_param(log_level, int, 0444); |
114 | 114 | ||
115 | int max_mru = MUSYCC_MRU; | 115 | int cxt1e1_max_mru = MUSYCC_MRU; |
116 | int max_mru_default = MUSYCC_MRU; | 116 | int max_mru_default = MUSYCC_MRU; |
117 | module_param(max_mru, int, 0444); | 117 | module_param(cxt1e1_max_mru, int, 0444); |
118 | 118 | ||
119 | int max_mtu = MUSYCC_MTU; | 119 | int cxt1e1_max_mtu = MUSYCC_MTU; |
120 | int max_mtu_default = MUSYCC_MTU; | 120 | int max_mtu_default = MUSYCC_MTU; |
121 | module_param(max_mtu, int, 0444); | 121 | module_param(cxt1e1_max_mtu, int, 0444); |
122 | 122 | ||
123 | int max_txdesc_used = MUSYCC_TXDESC_MIN; | 123 | int max_txdesc_used = MUSYCC_TXDESC_MIN; |
124 | int max_txdesc_default = MUSYCC_TXDESC_MIN; | 124 | int max_txdesc_default = MUSYCC_TXDESC_MIN; |
@@ -1118,12 +1118,12 @@ c4_mod_init (void) | |||
1118 | if (log_level != log_level_default) | 1118 | if (log_level != log_level_default) |
1119 | pr_info("NOTE: driver parameter <log_level> changed from default %d to %d.\n", | 1119 | pr_info("NOTE: driver parameter <log_level> changed from default %d to %d.\n", |
1120 | log_level_default, log_level); | 1120 | log_level_default, log_level); |
1121 | if (max_mru != max_mru_default) | 1121 | if (cxt1e1_max_mru != max_mru_default) |
1122 | pr_info("NOTE: driver parameter <max_mru> changed from default %d to %d.\n", | 1122 | pr_info("NOTE: driver parameter <cxt1e1_max_mru> changed from default %d to %d.\n", |
1123 | max_mru_default, max_mru); | 1123 | max_mru_default, cxt1e1_max_mru); |
1124 | if (max_mtu != max_mtu_default) | 1124 | if (cxt1e1_max_mtu != max_mtu_default) |
1125 | pr_info("NOTE: driver parameter <max_mtu> changed from default %d to %d.\n", | 1125 | pr_info("NOTE: driver parameter <cxt1e1_max_mtu> changed from default %d to %d.\n", |
1126 | max_mtu_default, max_mtu); | 1126 | max_mtu_default, cxt1e1_max_mtu); |
1127 | if (max_rxdesc_used != max_rxdesc_default) | 1127 | if (max_rxdesc_used != max_rxdesc_default) |
1128 | { | 1128 | { |
1129 | if (max_rxdesc_used > 2000) | 1129 | if (max_rxdesc_used > 2000) |
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; | |||
99 | extern int drvr_state; | 99 | extern int drvr_state; |
100 | extern int log_level; | 100 | extern int log_level; |
101 | 101 | ||
102 | extern int max_mru; | 102 | extern int cxt1e1_max_mru; |
103 | extern int max_mtu; | 103 | extern int cxt1e1_max_mtu; |
104 | extern int max_rxdesc_used; | 104 | extern int max_rxdesc_used; |
105 | extern int max_txdesc_used; | 105 | extern int max_txdesc_used; |
106 | extern ci_t *CI; /* dummy pointr to board ZEROE's data - DEBUG | 106 | extern ci_t *CI; /* dummy pointr to board ZEROE's data - DEBUG |
@@ -819,7 +819,7 @@ musycc_init_port (mpi_t * pi) | |||
819 | MUSYCC_PCD_TX_DRIVEN); | 819 | MUSYCC_PCD_TX_DRIVEN); |
820 | 820 | ||
821 | /* Message length descriptor */ | 821 | /* Message length descriptor */ |
822 | pi->regram->mld = __constant_cpu_to_le32 (max_mru | (max_mru << 16)); | 822 | pi->regram->mld = __constant_cpu_to_le32 (cxt1e1_max_mru | (cxt1e1_max_mru << 16)); |
823 | FLUSH_MEM_WRITE (); | 823 | FLUSH_MEM_WRITE (); |
824 | 824 | ||
825 | musycc_serv_req (pi, SR_GROUP_INIT | SR_RX_DIRECTION); | 825 | musycc_serv_req (pi, SR_GROUP_INIT | SR_RX_DIRECTION); |
@@ -913,17 +913,17 @@ musycc_init (ci_t * ci) | |||
913 | 913 | ||
914 | /* sanity check settable parameters */ | 914 | /* sanity check settable parameters */ |
915 | 915 | ||
916 | if (max_mru > 0xffe) | 916 | if (cxt1e1_max_mru > 0xffe) |
917 | { | 917 | { |
918 | pr_warning("Maximum allowed MRU exceeded, resetting %d to %d.\n", | 918 | pr_warning("Maximum allowed MRU exceeded, resetting %d to %d.\n", |
919 | max_mru, 0xffe); | 919 | cxt1e1_max_mru, 0xffe); |
920 | max_mru = 0xffe; | 920 | cxt1e1_max_mru = 0xffe; |
921 | } | 921 | } |
922 | if (max_mtu > 0xffe) | 922 | if (cxt1e1_max_mtu > 0xffe) |
923 | { | 923 | { |
924 | pr_warning("Maximum allowed MTU exceeded, resetting %d to %d.\n", | 924 | pr_warning("Maximum allowed MTU exceeded, resetting %d to %d.\n", |
925 | max_mtu, 0xffe); | 925 | cxt1e1_max_mtu, 0xffe); |
926 | max_mtu = 0xffe; | 926 | cxt1e1_max_mtu = 0xffe; |
927 | } | 927 | } |
928 | #ifdef SBE_WAN256T3_ENABLE | 928 | #ifdef SBE_WAN256T3_ENABLE |
929 | for (i = 0; i < MUSYCC_NPORTS; i++) | 929 | for (i = 0; i < MUSYCC_NPORTS; i++) |
@@ -1172,7 +1172,7 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan) | |||
1172 | #endif /*** CONFIG_SBE_WAN256T3_NCOMM ***/ | 1172 | #endif /*** CONFIG_SBE_WAN256T3_NCOMM ***/ |
1173 | 1173 | ||
1174 | { | 1174 | { |
1175 | if ((m2 = OS_mem_token_alloc (max_mru))) | 1175 | if ((m2 = OS_mem_token_alloc (cxt1e1_max_mru))) |
1176 | { | 1176 | { |
1177 | /* substitute the mbuf+cluster */ | 1177 | /* substitute the mbuf+cluster */ |
1178 | md->mem_token = m2; | 1178 | md->mem_token = m2; |
@@ -1204,7 +1204,7 @@ musycc_bh_rx_eom (mpi_t * pi, int gchan) | |||
1204 | ch->s.rx_length_errors++; | 1204 | ch->s.rx_length_errors++; |
1205 | } | 1205 | } |
1206 | FLUSH_MEM_WRITE (); | 1206 | FLUSH_MEM_WRITE (); |
1207 | status = max_mru; | 1207 | status = cxt1e1_max_mru; |
1208 | if (ch->p.chan_mode == CFG_CH_PROTO_TRANS) | 1208 | if (ch->p.chan_mode == CFG_CH_PROTO_TRANS) |
1209 | status |= EOBIRQ_ENABLE; | 1209 | status |= EOBIRQ_ENABLE; |
1210 | md->status = cpu_to_le32 (status); | 1210 | md->status = cpu_to_le32 (status); |
diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c index 9f730e68526..5c8a3eb0cfc 100644 --- a/drivers/staging/cxt1e1/pmcc4_drv.c +++ b/drivers/staging/cxt1e1/pmcc4_drv.c | |||
@@ -136,8 +136,8 @@ void musycc_update_timeslots (mpi_t *); | |||
136 | 136 | ||
137 | extern void musycc_update_tx_thp (mch_t *); | 137 | extern void musycc_update_tx_thp (mch_t *); |
138 | extern int log_level; | 138 | extern int log_level; |
139 | extern int max_mru; | 139 | extern int cxt1e1_max_mru; |
140 | extern int max_mtu; | 140 | extern int cxt1e1_max_mtu; |
141 | extern int max_rxdesc_used, max_rxdesc_default; | 141 | extern int max_rxdesc_used, max_rxdesc_default; |
142 | extern int max_txdesc_used, max_txdesc_default; | 142 | extern int max_txdesc_used, max_txdesc_default; |
143 | 143 | ||
@@ -1047,7 +1047,7 @@ c4_set_port (ci_t * ci, int portnum) | |||
1047 | MUSYCC_PCD_RXDATA_RISING); | 1047 | MUSYCC_PCD_RXDATA_RISING); |
1048 | 1048 | ||
1049 | /* Message length descriptor */ | 1049 | /* Message length descriptor */ |
1050 | pi->regram->mld = __constant_cpu_to_le32 (max_mru | (max_mru << 16)); | 1050 | pi->regram->mld = __constant_cpu_to_le32 (cxt1e1_max_mru | (cxt1e1_max_mru << 16)); |
1051 | 1051 | ||
1052 | /* tsm algorithm */ | 1052 | /* tsm algorithm */ |
1053 | for (i = 0; i < 32; i++) | 1053 | for (i = 0; i < 32; i++) |
@@ -1434,9 +1434,9 @@ c4_chan_up (ci_t * ci, int channum) | |||
1434 | ch->mdr = OS_kmalloc (sizeof (struct mdesc) * rxnum); | 1434 | ch->mdr = OS_kmalloc (sizeof (struct mdesc) * rxnum); |
1435 | ch->mdt = OS_kmalloc (sizeof (struct mdesc) * txnum); | 1435 | ch->mdt = OS_kmalloc (sizeof (struct mdesc) * txnum); |
1436 | if (ch->p.chan_mode == CFG_CH_PROTO_TRANS) | 1436 | if (ch->p.chan_mode == CFG_CH_PROTO_TRANS) |
1437 | tmp = __constant_cpu_to_le32 (max_mru | EOBIRQ_ENABLE); | 1437 | tmp = __constant_cpu_to_le32 (cxt1e1_max_mru | EOBIRQ_ENABLE); |
1438 | else | 1438 | else |
1439 | tmp = __constant_cpu_to_le32 (max_mru); | 1439 | tmp = __constant_cpu_to_le32 (cxt1e1_max_mru); |
1440 | 1440 | ||
1441 | for (i = 0, md = ch->mdr; i < rxnum; i++, md++) | 1441 | for (i = 0, md = ch->mdr; i < rxnum; i++, md++) |
1442 | { | 1442 | { |
@@ -1449,11 +1449,11 @@ c4_chan_up (ci_t * ci, int channum) | |||
1449 | } | 1449 | } |
1450 | md->next = cpu_to_le32 (OS_vtophys (md->snext)); | 1450 | md->next = cpu_to_le32 (OS_vtophys (md->snext)); |
1451 | 1451 | ||
1452 | if (!(m = OS_mem_token_alloc (max_mru))) | 1452 | if (!(m = OS_mem_token_alloc (cxt1e1_max_mru))) |
1453 | { | 1453 | { |
1454 | if (log_level >= LOG_MONITOR) | 1454 | if (log_level >= LOG_MONITOR) |
1455 | pr_info("%s: c4_chan_up[%d] - token alloc failure, size = %d.\n", | 1455 | pr_info("%s: c4_chan_up[%d] - token alloc failure, size = %d.\n", |
1456 | ci->devname, channum, max_mru); | 1456 | ci->devname, channum, cxt1e1_max_mru); |
1457 | goto errfree; | 1457 | goto errfree; |
1458 | } | 1458 | } |
1459 | md->mem_token = m; | 1459 | md->mem_token = m; |
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c index c3eed4bc6d7..70b9b33f352 100644 --- a/drivers/staging/cxt1e1/sbeproc.c +++ b/drivers/staging/cxt1e1/sbeproc.c | |||
@@ -171,17 +171,17 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset, | |||
171 | 171 | ||
172 | #ifdef SBE_PMCC4_ENABLE | 172 | #ifdef SBE_PMCC4_ENABLE |
173 | { | 173 | { |
174 | extern int max_mru; | 174 | extern int cxt1e1_max_mru; |
175 | #if 0 | 175 | #if 0 |
176 | extern int max_chans_used; | 176 | extern int max_chans_used; |
177 | extern int max_mtu; | 177 | extern int cxt1e1_max_mtu; |
178 | #endif | 178 | #endif |
179 | extern int max_rxdesc_used, max_txdesc_used; | 179 | extern int max_rxdesc_used, max_txdesc_used; |
180 | 180 | ||
181 | len += sprintf (buffer + len, "\nmax_mru: %d\n", max_mru); | 181 | len += sprintf (buffer + len, "\ncxt1e1_max_mru: %d\n", cxt1e1_max_mru); |
182 | #if 0 | 182 | #if 0 |
183 | len += sprintf (buffer + len, "\nmax_chans_used: %d\n", max_chans_used); | 183 | len += sprintf (buffer + len, "\nmax_chans_used: %d\n", max_chans_used); |
184 | len += sprintf (buffer + len, "max_mtu: %d\n", max_mtu); | 184 | len += sprintf (buffer + len, "cxt1e1_max_mtu: %d\n", cxt1e1_max_mtu); |
185 | #endif | 185 | #endif |
186 | len += sprintf (buffer + len, "max_rxdesc_used: %d\n", max_rxdesc_used); | 186 | len += sprintf (buffer + len, "max_rxdesc_used: %d\n", max_rxdesc_used); |
187 | len += sprintf (buffer + len, "max_txdesc_used: %d\n", max_txdesc_used); | 187 | len += sprintf (buffer + len, "max_txdesc_used: %d\n", max_txdesc_used); |