diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:32:02 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:32:02 +0200 |
commit | 91056a63a7d8dbc817747a22d9a9490463323575 (patch) | |
tree | a220d265d01075c05f4cd35d998e65849bb47bc8 /net/sched/act_mirred.c | |
parent | 05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff) | |
parent | f2d8df92f69b8c719ca1a46d2615b168b2cc9cdf (diff) | |
download | blackbird-op-linux-91056a63a7d8dbc817747a22d9a9490463323575.tar.gz blackbird-op-linux-91056a63a7d8dbc817747a22d9a9490463323575.zip |
Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup
Diffstat (limited to 'net/sched/act_mirred.c')
-rw-r--r-- | net/sched/act_mirred.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 102fc212cd64..e051398fdf6b 100644 --- a/net/sched/act_mirred.c +++ b/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) { |