Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/net/802/tr.c b/net/802/tr.c
index 1c6e596074df..5e20cf8a074b 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -145,7 +145,7 @@ static int tr_header(struct sk_buff *skb, struct net_device *dev,
         {
                 memcpy(trh->daddr,daddr,dev->addr_len);
                 tr_source_route(skb, trh, dev);
-                return(hdr_len);
+                return hdr_len;
         }
 
         return -hdr_len;