diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-27 11:59:19 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-27 11:59:19 -0400 |
| commit | 800f65bba8d2030b3fef62850e203f9f176625a8 (patch) | |
| tree | 6507c4fe7a0826c253b4afb29375ab306a0fd9c8 /include/net/route.h | |
| parent | 06b3cda0c12986f5bba578b918b188d731c4e191 (diff) | |
| parent | b3190df628617c7a4f188a9465aeabe1f5761933 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
Diffstat (limited to 'include/net/route.h')
| -rw-r--r-- | include/net/route.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/route.h b/include/net/route.h index af6cf4b4c9dc..bd732d62e1c3 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
| @@ -50,9 +50,7 @@ | |||
| 50 | struct fib_nh; | 50 | struct fib_nh; |
| 51 | struct inet_peer; | 51 | struct inet_peer; |
| 52 | struct rtable { | 52 | struct rtable { |
| 53 | union { | 53 | struct dst_entry dst; |
| 54 | struct dst_entry dst; | ||
| 55 | } u; | ||
| 56 | 54 | ||
| 57 | /* Cache lookup keys */ | 55 | /* Cache lookup keys */ |
| 58 | struct flowi fl; | 56 | struct flowi fl; |
| @@ -144,7 +142,7 @@ extern void fib_add_ifaddr(struct in_ifaddr *); | |||
| 144 | static inline void ip_rt_put(struct rtable * rt) | 142 | static inline void ip_rt_put(struct rtable * rt) |
| 145 | { | 143 | { |
| 146 | if (rt) | 144 | if (rt) |
| 147 | dst_release(&rt->u.dst); | 145 | dst_release(&rt->dst); |
| 148 | } | 146 | } |
| 149 | 147 | ||
| 150 | #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) | 148 | #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) |