From 6ad46b28f3a9dc07935fb17169eb01a7384f3c44 Mon Sep 17 00:00:00 2001
From: Jamal Hadi Salim <jhs@mojatatu.com>
Date: Mon, 15 Aug 2011 05:25:40 +0000
Subject: [PATCH] --- yaml --- r: 263225 b: refs/heads/master c:
 8919bc13e8d92c5b082c5c0321567383a071f5bc h: refs/heads/master i:   263223:
 1d2c8633c20fb172017a770730959962eaa01910 v: v3

---
 [refs]                       | 2 +-
 trunk/net/sched/act_mirred.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0c169f2645bc..89f48592ccd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2bceb3d7f145af5a0916bea700f2f9d380901ea
+refs/heads/master: 8919bc13e8d92c5b082c5c0321567383a071f5bc
diff --git a/trunk/net/sched/act_mirred.c b/trunk/net/sched/act_mirred.c
index 102fc212cd64..e051398fdf6b 100644
--- a/trunk/net/sched/act_mirred.c
+++ b/trunk/net/sched/act_mirred.c
@@ -196,8 +196,7 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
 
 	skb2->skb_iif = skb->dev->ifindex;
 	skb2->dev = dev;
-	dev_queue_xmit(skb2);
-	err = 0;
+	err = dev_queue_xmit(skb2);
 
 out:
 	if (err) {