summaryrefslogtreecommitdiff
path: root/include/net/dst.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-25 16:17:48 +0300
committerTakashi Iwai <tiwai@suse.de>2009-12-25 16:17:48 +0300
commit15e7f8b92aed71819411025279cd3df37f8c636b (patch)
tree6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /include/net/dst.h
parent21949f00a022e090a7e8bc9a01dfca88273c6146 (diff)
parentef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff)
downloadlinux-15e7f8b92aed71819411025279cd3df37f8c636b.tar.xz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'include/net/dst.h')
-rw-r--r--include/net/dst.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index 387cb3cfde7e..39c4a5963e12 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -113,7 +113,7 @@ dst_metric(const struct dst_entry *dst, int metric)
static inline u32
dst_feature(const struct dst_entry *dst, u32 feature)
{
- return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
+ return dst_metric(dst, RTAX_FEATURES) & feature;
}
static inline u32 dst_mtu(const struct dst_entry *dst)