aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/virtio_config.h
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-05-11 13:11:44 -0400
committerRusty Russell <rusty@rustcorp.com.au>2009-06-12 08:46:38 -0400
commitee006b353f1ca8c9a8470b72b462beb011d62e32 (patch)
tree205cb0ba2a4e08377effe7a2d10432047e82c1c9 /include/linux/virtio_config.h
parenta92892825a122a74ddad1d408fa27132e28b05ae (diff)
virtio: teach virtio_has_feature() about transport features
Drivers don't add transport features to their table, so we shouldn't check these with virtio_check_driver_offered_feature(). We could perhaps add an ->offered_feature() virtio_config_op, but that perhaps that would be overkill for a consitency check like this. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/linux/virtio_config.h')
-rw-r--r--include/linux/virtio_config.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 4cd290c06a88..99f514575f6a 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -113,7 +113,9 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
113 if (__builtin_constant_p(fbit)) 113 if (__builtin_constant_p(fbit))
114 BUILD_BUG_ON(fbit >= 32); 114 BUILD_BUG_ON(fbit >= 32);
115 115
116 virtio_check_driver_offered_feature(vdev, fbit); 116 if (fbit < VIRTIO_TRANSPORT_F_START)
117 virtio_check_driver_offered_feature(vdev, fbit);
118
117 return test_bit(fbit, vdev->features); 119 return test_bit(fbit, vdev->features);
118} 120}
119 121