Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6

1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index eca762d954c6..f0d0c5aad2b4 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3077,6 +3077,14 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,
         ixgbe_configure_srrctl(adapter, ring);
         ixgbe_configure_rscctl(adapter, ring);
 
+        /* If operating in IOV mode set RLPML for X540 */
+        if ((adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) &&
+            hw->mac.type == ixgbe_mac_X540) {
+                rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
+                rxdctl |= ((ring->netdev->mtu + ETH_HLEN +
+                            ETH_FCS_LEN + VLAN_HLEN) | IXGBE_RXDCTL_RLPML_EN);
+        }
+
         if (hw->mac.type == ixgbe_mac_82598EB) {
                 /*
                  * enable cache line friendly hardware writes:
@@ -5441,8 +5449,14 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
         /* MTU < 68 is an error and causes problems on some kernels */
-        if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
-                return -EINVAL;
+        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED &&
+            hw->mac.type != ixgbe_mac_X540) {
+                if ((new_mtu < 68) || (max_frame > MAXIMUM_ETHERNET_VLAN_SIZE))
+                        return -EINVAL;
+        } else {
+                if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
+                        return -EINVAL;
+        }
 
         e_info(probe, "changing MTU from %d to %d\n", netdev->mtu, new_mtu);
         /* must set new MTU before calling down or up */