diff options
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 3 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index d9713d933af5..45fa33e0cb90 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
@@ -1144,9 +1144,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) | |||
1144 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); | 1144 | consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1); |
1145 | count++; | 1145 | count++; |
1146 | } | 1146 | } |
1147 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) { | 1147 | for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) |
1148 | netxen_post_rx_buffers_nodb(adapter, ctxid, ring); | 1148 | netxen_post_rx_buffers_nodb(adapter, ctxid, ring); |
1149 | } | ||
1150 | 1149 | ||
1151 | /* update the consumer index in phantom */ | 1150 | /* update the consumer index in phantom */ |
1152 | if (count) { | 1151 | if (count) { |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index dc4d593217c9..a8fb439a4d03 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -166,9 +166,8 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter) | |||
166 | int port = adapter->portnum; | 166 | int port = adapter->portnum; |
167 | int pci_fn = adapter->ahw.pci_func; | 167 | int pci_fn = adapter->ahw.pci_func; |
168 | 168 | ||
169 | if (adapter->msi_mode != MSI_MODE_MULTIFUNC) { | 169 | if (adapter->msi_mode != MSI_MODE_MULTIFUNC) |
170 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port])); | 170 | writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port])); |
171 | } | ||
172 | 171 | ||
173 | if (adapter->intr_scheme != -1 && | 172 | if (adapter->intr_scheme != -1 && |
174 | adapter->intr_scheme != INTR_SCHEME_PERPORT) | 173 | adapter->intr_scheme != INTR_SCHEME_PERPORT) |