diff options
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r-- | drivers/net/jme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 6c1b92fa0b0c..792b88fc3574 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
@@ -1050,8 +1050,8 @@ jme_dynamic_pcc(struct jme_adapter *jme) | |||
1050 | 1050 | ||
1051 | if ((NET_STAT(jme).rx_bytes - dpi->last_bytes) > PCC_P3_THRESHOLD) | 1051 | if ((NET_STAT(jme).rx_bytes - dpi->last_bytes) > PCC_P3_THRESHOLD) |
1052 | jme_attempt_pcc(dpi, PCC_P3); | 1052 | jme_attempt_pcc(dpi, PCC_P3); |
1053 | else if ((NET_STAT(jme).rx_packets - dpi->last_pkts) > PCC_P2_THRESHOLD | 1053 | else if ((NET_STAT(jme).rx_packets - dpi->last_pkts) > PCC_P2_THRESHOLD || |
1054 | || dpi->intr_cnt > PCC_INTR_THRESHOLD) | 1054 | dpi->intr_cnt > PCC_INTR_THRESHOLD) |
1055 | jme_attempt_pcc(dpi, PCC_P2); | 1055 | jme_attempt_pcc(dpi, PCC_P2); |
1056 | else | 1056 | else |
1057 | jme_attempt_pcc(dpi, PCC_P1); | 1057 | jme_attempt_pcc(dpi, PCC_P1); |
@@ -2199,8 +2199,8 @@ jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd) | |||
2199 | if (netif_running(netdev)) | 2199 | if (netif_running(netdev)) |
2200 | return -EBUSY; | 2200 | return -EBUSY; |
2201 | 2201 | ||
2202 | if (ecmd->use_adaptive_rx_coalesce | 2202 | if (ecmd->use_adaptive_rx_coalesce && |
2203 | && test_bit(JME_FLAG_POLL, &jme->flags)) { | 2203 | test_bit(JME_FLAG_POLL, &jme->flags)) { |
2204 | clear_bit(JME_FLAG_POLL, &jme->flags); | 2204 | clear_bit(JME_FLAG_POLL, &jme->flags); |
2205 | jme->jme_rx = netif_rx; | 2205 | jme->jme_rx = netif_rx; |
2206 | jme->jme_vlan_rx = vlan_hwaccel_rx; | 2206 | jme->jme_vlan_rx = vlan_hwaccel_rx; |
@@ -2209,8 +2209,8 @@ jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd) | |||
2209 | dpi->cnt = 0; | 2209 | dpi->cnt = 0; |
2210 | jme_set_rx_pcc(jme, PCC_P1); | 2210 | jme_set_rx_pcc(jme, PCC_P1); |
2211 | jme_interrupt_mode(jme); | 2211 | jme_interrupt_mode(jme); |
2212 | } else if (!(ecmd->use_adaptive_rx_coalesce) | 2212 | } else if (!(ecmd->use_adaptive_rx_coalesce) && |
2213 | && !(test_bit(JME_FLAG_POLL, &jme->flags))) { | 2213 | !(test_bit(JME_FLAG_POLL, &jme->flags))) { |
2214 | set_bit(JME_FLAG_POLL, &jme->flags); | 2214 | set_bit(JME_FLAG_POLL, &jme->flags); |
2215 | jme->jme_rx = netif_receive_skb; | 2215 | jme->jme_rx = netif_receive_skb; |
2216 | jme->jme_vlan_rx = vlan_hwaccel_receive_skb; | 2216 | jme->jme_vlan_rx = vlan_hwaccel_receive_skb; |