2 files changed, 9 insertions, 1 deletions

diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index c0e56aab5489..2d877da143cf 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -71,6 +71,7 @@
 #define IXGBE_RXBUFFER_128   128    /* Used for packet split */
 #define IXGBE_RXBUFFER_256   256    /* Used for packet split */
 #define IXGBE_RXBUFFER_2048  2048
+#define IXGBE_MAX_RXBUFFER   16384  /* largest size for a single descriptor */
 
 #define IXGBE_RX_HDR_SIZE IXGBE_RXBUFFER_256
 
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index e0d736cc245b..65642355a836 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1550,7 +1550,14 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index)
         srrctl &= ~IXGBE_SRRCTL_BSIZEPKT_MASK;
 
         if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
-                srrctl |= IXGBE_RXBUFFER_2048 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+                u16 bufsz = IXGBE_RXBUFFER_2048;
+                /* grow the amount we can receive on large page machines */
+                if (bufsz < (PAGE_SIZE / 2))
+                        bufsz = (PAGE_SIZE / 2);
+                /* cap the bufsz at our largest descriptor size */
+                bufsz = min((u16)IXGBE_MAX_RXBUFFER, bufsz);
+
+                srrctl |= bufsz >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
                 srrctl |= IXGBE_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS;
                 srrctl |= ((IXGBE_RX_HDR_SIZE <<
                             IXGBE_SRRCTL_BSIZEHDRSIZE_SHIFT) &