From: Kees van Reeuwijk Date: Wed, 20 Jan 2010 21:31:59 +0000 (+0000) Subject: Remove iov_src variables, that were only declared and incremented, X-Git-Tag: v3.1.6~60 X-Git-Url: http://zhaoyanbai.com/repos/man.arpaname.html?a=commitdiff_plain;h=a2c8ae42e911916b79291003513675e38a03a144;p=minix.git Remove iov_src variables, that were only declared and incremented, but never used, all over the network drivers. --- diff --git a/drivers/orinoco/orinoco.c b/drivers/orinoco/orinoco.c index 7a34761cd..17302cd47 100644 --- a/drivers/orinoco/orinoco.c +++ b/drivers/orinoco/orinoco.c @@ -1376,7 +1376,6 @@ static void or_writev (message * mp, int from_int, int vectored) { t_or *orp; clock_t timebefore, t0; phys_bytes phys_user; - phys_bytes iov_src = 0; hermes_t *hw; struct hermes_tx_descriptor desc; struct header_struct hdr; @@ -1420,7 +1419,6 @@ static void or_writev (message * mp, int from_int, int vectored) { o = 0; for (i = 0; i < count; i += IOVEC_NR, - iov_src += IOVEC_NR * sizeof (orp->or_iovec[0]), iov_offset += IOVEC_NR * sizeof (orp->or_iovec[0])) { n = IOVEC_NR; @@ -1545,7 +1543,6 @@ static void or_writev_s (message * mp, int from_int) { t_or *orp; clock_t timebefore, t0; phys_bytes phys_user; - phys_bytes iov_src = 0; hermes_t *hw; struct hermes_tx_descriptor desc; int iov_offset = 0; @@ -1606,7 +1603,6 @@ static void or_writev_s (message * mp, int from_int) { size = 0; o = 0; for (i = 0; i < count; i += IOVEC_NR, - iov_src += IOVEC_NR * sizeof (orp->or_iovec_s[0]), iov_offset += IOVEC_NR * sizeof (orp->or_iovec_s[0])) { n = IOVEC_NR; @@ -1993,7 +1989,6 @@ static void or_readv (message * mp, int from_int, int vectored) { unsigned amount, totlen, packlen; struct hermes_rx_descriptor desc; phys_bytes dst_phys; - phys_bytes iov_src = 0; u16_t d_start, d_end, rxfid, status; struct header_struct hdr; int length, offset; @@ -2039,7 +2034,6 @@ static void or_readv (message * mp, int from_int, int vectored) { size = 0; for (i = 0; i < count; i += IOVEC_NR, - iov_src += IOVEC_NR * sizeof (orp->or_iovec[0]), iov_offset += IOVEC_NR * sizeof(orp->or_iovec[0])) { n = IOVEC_NR; @@ -2117,7 +2111,6 @@ static void or_readv_s (message * mp, int from_int) { unsigned amount, totlen, packlen; struct hermes_rx_descriptor desc; phys_bytes dst_phys; - phys_bytes iov_src = 0; u16_t d_start, d_end, rxfid, status; struct header_struct hdr; u32_t l, rxstat; @@ -2174,7 +2167,6 @@ static void or_readv_s (message * mp, int from_int) { * *databuf and will be copied to the vecor below */ size = 0; for (i = 0; i < count; i += IOVEC_NR, - iov_src += IOVEC_NR * sizeof (orp->or_iovec_s[0]), iov_offset += IOVEC_NR * sizeof(orp->or_iovec_s[0])) { n = IOVEC_NR; if (i + n > count) diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c index 32e4f0d58..dcc4346e5 100644 --- a/drivers/rtl8139/rtl8139.c +++ b/drivers/rtl8139/rtl8139.c @@ -980,7 +980,6 @@ static void rl_readv(message *mp, int from_int, int vectored) port_t port; unsigned amount, totlen, packlen; phys_bytes src_phys, dst_phys; - phys_bytes iov_src = 0; u16_t d_start, d_end; u32_t l, rxstat = 0x12345678; re_t *rep; @@ -1080,7 +1079,6 @@ static void rl_readv(message *mp, int from_int, int vectored) o= d_start+4; src_phys= rep->re_rx_buf; for (i= 0; ire_iovec[0]), iov_offset += IOVEC_NR * sizeof(rep->re_iovec[0])) { n= IOVEC_NR; @@ -1230,7 +1228,6 @@ static void rl_readv_s(message *mp, int from_int) port_t port; unsigned amount, totlen, packlen; phys_bytes src_phys, dst_phys; - phys_bytes iov_src = 0; u16_t d_start, d_end; u32_t l, rxstat = 0x12345678; re_t *rep; @@ -1327,7 +1324,6 @@ static void rl_readv_s(message *mp, int from_int) o= d_start+4; src_phys= rep->re_rx_buf; for (i= 0; ire_iovec_s[0]), iov_offset += IOVEC_NR * sizeof(rep->re_iovec_s[0])) { n= IOVEC_NR; @@ -1463,7 +1459,6 @@ suspend: *===========================================================================*/ static void rl_writev(message *mp, int from_int, int vectored) { - phys_bytes iov_src = 0; phys_bytes phys_user; int i, j, n, s, port, count, size; int tx_head, re_client; @@ -1520,7 +1515,6 @@ static void rl_writev(message *mp, int from_int, int vectored) size= 0; ret = rep->re_tx[tx_head].v_ret_buf; for (i= 0; ire_iovec[0]), iov_offset += IOVEC_NR * sizeof(rep->re_iovec[0])) { n= IOVEC_NR; @@ -1608,7 +1602,6 @@ suspend: *===========================================================================*/ static void rl_writev_s(message *mp, int from_int) { - phys_bytes iov_src = 0; int i, j, n, s, port, count, size; int tx_head, re_client; re_t *rep; @@ -1661,7 +1654,6 @@ static void rl_writev_s(message *mp, int from_int) size= 0; ret = rep->re_tx[tx_head].v_ret_buf; for (i= 0; ire_iovec_s[0]), iov_offset += IOVEC_NR * sizeof(rep->re_iovec_s[0])) { n= IOVEC_NR; diff --git a/drivers/rtl8169/rtl8169.c b/drivers/rtl8169/rtl8169.c index 19d9aab4d..70586301c 100644 --- a/drivers/rtl8169/rtl8169.c +++ b/drivers/rtl8169/rtl8169.c @@ -1306,7 +1306,6 @@ static void rl_readv_s(message *mp, int from_int) port_t port; unsigned totlen, packlen; phys_bytes src_phys; - phys_bytes iov_src = 0; re_desc *desc; u32_t rxstat = 0x12345678; re_t *rep; @@ -1375,7 +1374,6 @@ readvs_loop: size = 0; src_phys = rep->re_rx[index].ret_buf; for (i = 0; i < count; i += IOVEC_NR, - iov_src += IOVEC_NR * sizeof(rep->re_iovec_s[0]), iov_offset += IOVEC_NR * sizeof(rep->re_iovec_s[0])) { n = IOVEC_NR; @@ -1450,7 +1448,6 @@ suspend: *===========================================================================*/ static void rl_writev_s(message *mp, int from_int) { - phys_bytes iov_src = 0; int i, j, n, s, port, count, size; int tx_head, re_client; re_t *rep; @@ -1521,7 +1518,6 @@ static void rl_writev_s(message *mp, int from_int) size = 0; ret = rep->re_tx[tx_head].v_ret_buf; for (i = 0; i < count; i += IOVEC_NR, - iov_src += IOVEC_NR * sizeof(rep->re_iovec_s[0]), iov_offset += IOVEC_NR * sizeof(rep->re_iovec_s[0])) { n = IOVEC_NR;