From 989847fb9a4ec763160f395ee0d89a3c409743d3 Mon Sep 17 00:00:00 2001 From: Guo-Fu Tseng Date: Wed, 22 Feb 2012 08:58:10 +0000 Subject: [PATCH] --- yaml --- r: 287981 b: refs/heads/master c: ba9adbe67e288823ac1deb7f11576ab5653f833e h: refs/heads/master i: 287979: 7259afaa3c9c0844730b2aab816cd173250a8c54 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/jme.c | 10 +--------- trunk/drivers/net/ethernet/jme.h | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e7fbbeb29dd9..ab802ec7163a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 597cdbc2239e6019bbb2dd73b266f436166f0427 +refs/heads/master: ba9adbe67e288823ac1deb7f11576ab5653f833e diff --git a/trunk/drivers/net/ethernet/jme.c b/trunk/drivers/net/ethernet/jme.c index 27d651a80f3f..55cbf65512c3 100644 --- a/trunk/drivers/net/ethernet/jme.c +++ b/trunk/drivers/net/ethernet/jme.c @@ -2328,19 +2328,11 @@ jme_change_mtu(struct net_device *netdev, int new_mtu) ((new_mtu) < IPV6_MIN_MTU)) return -EINVAL; - if (new_mtu > 4000) { - jme->reg_rxcs &= ~RXCS_FIFOTHNP; - jme->reg_rxcs |= RXCS_FIFOTHNP_64QW; - jme_restart_rx_engine(jme); - } else { - jme->reg_rxcs &= ~RXCS_FIFOTHNP; - jme->reg_rxcs |= RXCS_FIFOTHNP_128QW; - jme_restart_rx_engine(jme); - } netdev->mtu = new_mtu; netdev_update_features(netdev); + jme_restart_rx_engine(jme); jme_reset_link(jme); return 0; diff --git a/trunk/drivers/net/ethernet/jme.h b/trunk/drivers/net/ethernet/jme.h index 4304072bd3c5..3efc897c9913 100644 --- a/trunk/drivers/net/ethernet/jme.h +++ b/trunk/drivers/net/ethernet/jme.h @@ -730,7 +730,7 @@ enum jme_rxcs_values { RXCS_RETRYCNT_60 = 0x00000F00, RXCS_DEFAULT = RXCS_FIFOTHTP_128T | - RXCS_FIFOTHNP_128QW | + RXCS_FIFOTHNP_16QW | RXCS_DMAREQSZ_128B | RXCS_RETRYGAP_256ns | RXCS_RETRYCNT_32,