3 files changed, 9 insertions, 5 deletions

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h
index 0a4bfab7a19..fa315519c07 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c.h
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h
@@ -74,8 +74,6 @@
 
 #define AT_RX_BUF_SIZE          (ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN)
 #define MAX_JUMBO_FRAME_SIZE    (6*1024)
-#define MAX_TSO_FRAME_SIZE      (7*1024)
-#define MAX_TX_OFFLOAD_THRESH   (9*1024)
 
 #define AT_MAX_RECEIVE_QUEUE    4
 #define AT_DEF_RECEIVE_QUEUE    1
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
index c1aa3ba7545..c9c67821310 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
@@ -500,6 +500,7 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 /* Jumbo packet Threshold for task offload */
 #define REG_TX_TSO_OFFLOAD_THRESH       0x1594 /* In 8-bytes */
 #define TX_TSO_OFFLOAD_THRESH_MASK      0x07FF
+#define MAX_TSO_FRAME_SIZE              (7*1024)
 
 #define REG_TXF_WATER_MARK              0x1598 /* In 8-bytes */
 #define TXF_WATER_MARK_MASK             0x0FFF
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index d2f89f026d7..e8e9c104cfe 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -501,11 +501,16 @@ static int atl1c_set_features(struct net_device *netdev,
 static int atl1c_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct atl1c_adapter *adapter = netdev_priv(netdev);
+        struct atl1c_hw *hw = &adapter->hw;
         int old_mtu   = netdev->mtu;
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
 
-        if ((max_frame < ETH_ZLEN + ETH_FCS_LEN) ||
-                        (max_frame > MAX_JUMBO_FRAME_SIZE)) {
+        /* Fast Ethernet controller doesn't support jumbo packet */
+        if (((hw->nic_type == athr_l2c ||
+              hw->nic_type == athr_l2c_b ||
+              hw->nic_type == athr_l2c_b2) && new_mtu > ETH_DATA_LEN) ||
+              max_frame < ETH_ZLEN + ETH_FCS_LEN ||
+              max_frame > MAX_JUMBO_FRAME_SIZE) {
                 if (netif_msg_link(adapter))
                         dev_warn(&adapter->pdev->dev, "invalid MTU setting\n");
                 return -EINVAL;
@@ -1049,7 +1054,7 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
         u16 tx_offload_thresh;
         u32 txq_ctrl_data;
 
-        tx_offload_thresh = MAX_TX_OFFLOAD_THRESH;
+        tx_offload_thresh = MAX_TSO_FRAME_SIZE;
         AT_WRITE_REG(hw, REG_TX_TSO_OFFLOAD_THRESH,
                 (tx_offload_thresh >> 3) & TX_TSO_OFFLOAD_THRESH_MASK);
         max_pay_load = pcie_get_readrq(adapter->pdev) >> 8;