From c72fc2884603e866e5a87e8b53021255e2f9b872 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Sat, 11 Jun 2011 01:44:58 +0000
Subject: [PATCH] --- yaml --- r: 256616 b: refs/heads/master c:
 82d4e46e2a398154273044dd9813206f0d85bc09 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 34c5729f7425..07f710fe33a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6440752c872e418452a2cbbf5e73d546affe2b28
+refs/heads/master: 82d4e46e2a398154273044dd9813206f0d85bc09
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index f05ddf31a19f..7275c5cc09b2 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -6785,7 +6785,7 @@ static int __ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
 	return 0;
 }
 
-static int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
+static inline int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
 {
 	if (likely(ixgbe_desc_unused(tx_ring) >= size))
 		return 0;