[PATCH net-next v6 1/7] tun: Refactor CONFIG_TUN_VNET_CROSS_LE

[Akihiko Odaki]

Check IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE) to save some lines and make
future changes easier.

Signed-off-by: Akihiko Odaki <akihiko.od...@daynix.com>
Reviewed-by: Willem de Bruijn <will...@google.com>
---
 drivers/net/tun.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 
e816aaba8e5f2ed06f8832f79553b6c976e75bb8..4b189cbd28e63ec6325073d9a7678f4210bff3e1
 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -298,17 +298,21 @@ static bool tun_napi_frags_enabled(const struct tun_file 
*tfile)
        return tfile->napi_frags_enabled;
 }
 
-#ifdef CONFIG_TUN_VNET_CROSS_LE
 static inline bool tun_legacy_is_little_endian(struct tun_struct *tun)
 {
-       return tun->flags & TUN_VNET_BE ? false :
-               virtio_legacy_is_little_endian();
+       bool be = IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE) &&
+                 (tun->flags & TUN_VNET_BE);
+
+       return !be && virtio_legacy_is_little_endian();
 }
 
 static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp)
 {
        int be = !!(tun->flags & TUN_VNET_BE);
 
+       if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE))
+               return -EINVAL;
+
        if (put_user(be, argp))
                return -EFAULT;
 
@@ -319,6 +323,9 @@ static long tun_set_vnet_be(struct tun_struct *tun, int 
__user *argp)
 {
        int be;
 
+       if (!IS_ENABLED(CONFIG_TUN_VNET_CROSS_LE))
+               return -EINVAL;
+
        if (get_user(be, argp))
                return -EFAULT;
 
@@ -329,22 +336,6 @@ static long tun_set_vnet_be(struct tun_struct *tun, int 
__user *argp)
 
        return 0;
 }
-#else
-static inline bool tun_legacy_is_little_endian(struct tun_struct *tun)
-{
-       return virtio_legacy_is_little_endian();
-}
-
-static long tun_get_vnet_be(struct tun_struct *tun, int __user *argp)
-{
-       return -EINVAL;
-}
-
-static long tun_set_vnet_be(struct tun_struct *tun, int __user *argp)
-{
-       return -EINVAL;
-}
-#endif /* CONFIG_TUN_VNET_CROSS_LE */
 
 static inline bool tun_is_little_endian(struct tun_struct *tun)
 {

-- 
2.48.1