From 1becabe88a32cbc650d12b9e3da4656e464932c8 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 29 Oct 2009 07:21:33 +0000
Subject: [PATCH] --- yaml --- r: 171080 b: refs/heads/master c:
 c3c6336504c59d9febc30de199dfee6a65a5d6ae h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sfc/rx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a987960accc9..7f3b85a385fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18e1d2beb6c2307d3cab7ecb44fd3d4382adcf6a
+refs/heads/master: c3c6336504c59d9febc30de199dfee6a65a5d6ae
diff --git a/trunk/drivers/net/sfc/rx.c b/trunk/drivers/net/sfc/rx.c
index 9277e9aaad09..a60c7188fdad 100644
--- a/trunk/drivers/net/sfc/rx.c
+++ b/trunk/drivers/net/sfc/rx.c
@@ -61,7 +61,7 @@
  *   rx_alloc_method = (rx_alloc_level > RX_ALLOC_LEVEL_LRO ?
  *                      RX_ALLOC_METHOD_PAGE : RX_ALLOC_METHOD_SKB)
  */
-static int rx_alloc_method = RX_ALLOC_METHOD_PAGE;
+static int rx_alloc_method = RX_ALLOC_METHOD_AUTO;
 
 #define RX_ALLOC_LEVEL_LRO 0x2000
 #define RX_ALLOC_LEVEL_MAX 0x3000