diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /include/net/dst.h | |
parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'include/net/dst.h')
-rw-r--r-- | include/net/dst.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 002500e631f5..c5c318a628f8 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -128,6 +128,18 @@ static inline u32 dst_mtu(const struct dst_entry *dst) | |||
128 | return mtu; | 128 | return mtu; |
129 | } | 129 | } |
130 | 130 | ||
131 | /* RTT metrics are stored in milliseconds for user ABI, but used as jiffies */ | ||
132 | static inline unsigned long dst_metric_rtt(const struct dst_entry *dst, int metric) | ||
133 | { | ||
134 | return msecs_to_jiffies(dst_metric(dst, metric)); | ||
135 | } | ||
136 | |||
137 | static inline void set_dst_metric_rtt(struct dst_entry *dst, int metric, | ||
138 | unsigned long rtt) | ||
139 | { | ||
140 | dst->metrics[metric-1] = jiffies_to_msecs(rtt); | ||
141 | } | ||
142 | |||
131 | static inline u32 | 143 | static inline u32 |
132 | dst_allfrag(const struct dst_entry *dst) | 144 | dst_allfrag(const struct dst_entry *dst) |
133 | { | 145 | { |