diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
| commit | e8b9dd7e2471b1274e3be719fcc385e0a710e46f (patch) | |
| tree | 030d7ce20e8f8767d9423f78c102aba089eec372 /include/net/route.h | |
| parent | 924412f66fd9d21212e560a93792b0b607d46c6e (diff) | |
| parent | 6b1859dba01c7d512b72d77e3fd7da8354235189 (diff) | |
Merge branch 'timers/urgent' into timers/core
Reason: Update to upstream changes to avoid further conflicts.
Fixup a trivial merge conflict in kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/net/route.h')
| -rw-r--r-- | include/net/route.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/route.h b/include/net/route.h index ed2b78e2375..98705468ac0 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -130,9 +130,9 @@ static inline struct rtable *ip_route_output(struct net *net, __be32 daddr, { struct flowi4 fl4 = { .flowi4_oif = oif, + .flowi4_tos = tos, .daddr = daddr, .saddr = saddr, - .flowi4_tos = tos, }; return ip_route_output_key(net, &fl4); } |