1 files changed, 9 insertions, 18 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index b7a46c513783..4072fbb6493d 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4212,27 +4212,17 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
         struct e1000_adapter *adapter = netdev_priv(netdev);
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
-        if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) ||
-            (max_frame > MAX_JUMBO_FRAME_SIZE)) {
-                e_err("Invalid MTU setting\n");
+        /* Jumbo frame support */
+        if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
+            !(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
+                e_err("Jumbo Frames not supported.\n");
                 return -EINVAL;
         }
 
-        /* Jumbo frame size limits */
-        if (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) {
-                if (!(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {
-                        e_err("Jumbo Frames not supported.\n");
-                        return -EINVAL;
-                }
-                if (adapter->hw.phy.type == e1000_phy_ife) {
-                        e_err("Jumbo Frames not supported.\n");
-                        return -EINVAL;
-                }
-        }
-
-#define MAX_STD_JUMBO_FRAME_SIZE 9234
-        if (max_frame > MAX_STD_JUMBO_FRAME_SIZE) {
-                e_err("MTU > 9216 not supported.\n");
+        /* Supported frame sizes */
+        if ((new_mtu < ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN) ||
+            (max_frame > adapter->max_hw_frame_size)) {
+                e_err("Unsupported MTU setting\n");
                 return -EINVAL;
         }
 
@@ -4848,6 +4838,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         adapter->flags2 = ei->flags2;
         adapter->hw.adapter = adapter;
         adapter->hw.mac.type = ei->mac;
+        adapter->max_hw_frame_size = ei->max_hw_frame_size;
         adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
 
         mmio_start = pci_resource_start(pdev, 0);