]> git.droids-corp.org - dpdk.git/commitdiff
net/af_xdp: make UMEM configure more readable
authorHaiyue Wang <haiyue.wang@intel.com>
Wed, 9 Feb 2022 12:43:58 +0000 (20:43 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Thu, 10 Feb 2022 10:23:17 +0000 (11:23 +0100)
The below compile time defined style make the code not so readable, the
first function end block is after "#endif" segment.

#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)

xdp_umem_configure()
{

#else
xdp_umem_configure()
{

#endif
'shared code block'
}

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Acked-by: Ciara Loftus <ciara.loftus@intel.com>
drivers/net/af_xdp/rte_eth_af_xdp.c

index 1b6192fa443ae3ee631b09fb703f5b082df791ad..802f912cb7c55b8b478e6a18bc6a327564e2a5e7 100644 (file)
@@ -1078,6 +1078,12 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
                __atomic_store_n(&umem->refcnt, 1, __ATOMIC_RELEASE);
        }
 
+       return umem;
+
+err:
+       xdp_umem_destroy(umem);
+       return NULL;
+}
 #else
 static struct
 xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
@@ -1138,13 +1144,13 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals,
        }
        umem->mz = mz;
 
-#endif
        return umem;
 
 err:
        xdp_umem_destroy(umem);
        return NULL;
 }
+#endif
 
 static int
 load_custom_xdp_prog(const char *prog_path, int if_index, struct bpf_map **map)