From 10e2d210b64aaa41ad4ba1c2a19349bdb8aaf7a5 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Fri, 3 Dec 2010 19:55:20 +0000
Subject: [PATCH] --- yaml --- r: 224966 b: refs/heads/master c:
 c6350362cbb19882ba0eb3578cc1abc07e6ea204 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/ifb.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b2b7c5126744..0fbda8816c86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1f91505025db74c261962dc16d58f79b9b0c83c
+refs/heads/master: c6350362cbb19882ba0eb3578cc1abc07e6ea204
diff --git a/trunk/drivers/net/ifb.c b/trunk/drivers/net/ifb.c
index e4cd6632c7db..d58c4f74f01a 100644
--- a/trunk/drivers/net/ifb.c
+++ b/trunk/drivers/net/ifb.c
@@ -36,8 +36,6 @@
 #include <net/pkt_sched.h>
 #include <net/net_namespace.h>
 
-#define TX_TIMEOUT  (2*HZ)
-
 #define TX_Q_LIMIT    32
 struct ifb_private {
 	struct tasklet_struct   ifb_tasklet;