|
@@ -566,9 +566,8 @@ static int
|
|
netxen_send_cmd_descs(struct netxen_adapter *adapter,
|
|
netxen_send_cmd_descs(struct netxen_adapter *adapter,
|
|
struct cmd_desc_type0 *cmd_desc_arr, int nr_desc)
|
|
struct cmd_desc_type0 *cmd_desc_arr, int nr_desc)
|
|
{
|
|
{
|
|
- u32 i, producer, consumer;
|
|
|
|
|
|
+ u32 i, producer;
|
|
struct netxen_cmd_buffer *pbuf;
|
|
struct netxen_cmd_buffer *pbuf;
|
|
- struct cmd_desc_type0 *cmd_desc;
|
|
|
|
struct nx_host_tx_ring *tx_ring;
|
|
struct nx_host_tx_ring *tx_ring;
|
|
|
|
|
|
i = 0;
|
|
i = 0;
|
|
@@ -580,7 +579,6 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter,
|
|
__netif_tx_lock_bh(tx_ring->txq);
|
|
__netif_tx_lock_bh(tx_ring->txq);
|
|
|
|
|
|
producer = tx_ring->producer;
|
|
producer = tx_ring->producer;
|
|
- consumer = tx_ring->sw_consumer;
|
|
|
|
|
|
|
|
if (nr_desc >= netxen_tx_avail(tx_ring)) {
|
|
if (nr_desc >= netxen_tx_avail(tx_ring)) {
|
|
netif_tx_stop_queue(tx_ring->txq);
|
|
netif_tx_stop_queue(tx_ring->txq);
|
|
@@ -595,8 +593,6 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter,
|
|
}
|
|
}
|
|
|
|
|
|
do {
|
|
do {
|
|
- cmd_desc = &cmd_desc_arr[i];
|
|
|
|
-
|
|
|
|
pbuf = &tx_ring->cmd_buf_arr[producer];
|
|
pbuf = &tx_ring->cmd_buf_arr[producer];
|
|
pbuf->skb = NULL;
|
|
pbuf->skb = NULL;
|
|
pbuf->frag_count = 0;
|
|
pbuf->frag_count = 0;
|
|
@@ -2350,7 +2346,7 @@ static int netxen_md_entry_err_chk(struct netxen_adapter *adapter,
|
|
static int netxen_parse_md_template(struct netxen_adapter *adapter)
|
|
static int netxen_parse_md_template(struct netxen_adapter *adapter)
|
|
{
|
|
{
|
|
int num_of_entries, buff_level, e_cnt, esize;
|
|
int num_of_entries, buff_level, e_cnt, esize;
|
|
- int end_cnt = 0, rv = 0, sane_start = 0, sane_end = 0;
|
|
|
|
|
|
+ int rv = 0, sane_start = 0, sane_end = 0;
|
|
char *dbuff;
|
|
char *dbuff;
|
|
void *template_buff = adapter->mdump.md_template;
|
|
void *template_buff = adapter->mdump.md_template;
|
|
char *dump_buff = adapter->mdump.md_capture_buff;
|
|
char *dump_buff = adapter->mdump.md_capture_buff;
|
|
@@ -2386,8 +2382,6 @@ static int netxen_parse_md_template(struct netxen_adapter *adapter)
|
|
break;
|
|
break;
|
|
case RDEND:
|
|
case RDEND:
|
|
entry->hdr.driver_flags |= NX_DUMP_SKIP;
|
|
entry->hdr.driver_flags |= NX_DUMP_SKIP;
|
|
- if (!sane_end)
|
|
|
|
- end_cnt = e_cnt;
|
|
|
|
sane_end += 1;
|
|
sane_end += 1;
|
|
break;
|
|
break;
|
|
case CNTRL:
|
|
case CNTRL:
|