diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 9f5ced3eaf9d..23c974a7e0e4 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -526,7 +526,7 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter, | |||
526 | producer = tx_ring->producer; | 526 | producer = tx_ring->producer; |
527 | consumer = tx_ring->sw_consumer; | 527 | consumer = tx_ring->sw_consumer; |
528 | 528 | ||
529 | if (nr_desc > find_diff_among(producer, consumer, tx_ring->num_desc)) { | 529 | if (nr_desc >= find_diff_among(producer, consumer, tx_ring->num_desc)) { |
530 | netif_tx_unlock_bh(adapter->netdev); | 530 | netif_tx_unlock_bh(adapter->netdev); |
531 | return -EBUSY; | 531 | return -EBUSY; |
532 | } | 532 | } |
@@ -752,7 +752,7 @@ int netxen_linkevent_request(struct netxen_adapter *adapter, int enable) | |||
752 | 752 | ||
753 | word = NX_NIC_H2C_OPCODE_GET_LINKEVENT | ((u64)adapter->portnum << 16); | 753 | word = NX_NIC_H2C_OPCODE_GET_LINKEVENT | ((u64)adapter->portnum << 16); |
754 | req.req_hdr = cpu_to_le64(word); | 754 | req.req_hdr = cpu_to_le64(word); |
755 | req.words[0] = cpu_to_le64(enable); | 755 | req.words[0] = cpu_to_le64(enable | (enable << 8)); |
756 | 756 | ||
757 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); | 757 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); |
758 | if (rv != 0) { | 758 | if (rv != 0) { |