Commit 965d2cb0 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Alexei Starovoitov

selftests: xsk: Remove inline keyword from source file

Follow the kernel coding style guidelines and let compiler do the
decision about inlining.
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210329224316.17793-5-maciej.fijalkowski@intel.com
parent 7519c387
...@@ -158,7 +158,7 @@ static void *memset32_htonl(void *dest, u32 val, u32 size) ...@@ -158,7 +158,7 @@ static void *memset32_htonl(void *dest, u32 val, u32 size)
* This function code has been taken from * This function code has been taken from
* Linux kernel include/asm-generic/checksum.h * Linux kernel include/asm-generic/checksum.h
*/ */
static inline __u16 csum_fold(__u32 csum) static __u16 csum_fold(__u32 csum)
{ {
u32 sum = (__force u32)csum; u32 sum = (__force u32)csum;
...@@ -171,7 +171,7 @@ static inline __u16 csum_fold(__u32 csum) ...@@ -171,7 +171,7 @@ static inline __u16 csum_fold(__u32 csum)
* This function code has been taken from * This function code has been taken from
* Linux kernel lib/checksum.c * Linux kernel lib/checksum.c
*/ */
static inline u32 from64to32(u64 x) static u32 from64to32(u64 x)
{ {
/* add up 32-bit and 32-bit for 32+c bit */ /* add up 32-bit and 32-bit for 32+c bit */
x = (x & 0xffffffff) + (x >> 32); x = (x & 0xffffffff) + (x >> 32);
...@@ -180,13 +180,11 @@ static inline u32 from64to32(u64 x) ...@@ -180,13 +180,11 @@ static inline u32 from64to32(u64 x)
return (u32)x; return (u32)x;
} }
__u32 csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __u32 sum);
/* /*
* This function code has been taken from * This function code has been taken from
* Linux kernel lib/checksum.c * Linux kernel lib/checksum.c
*/ */
__u32 csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __u32 sum) static __u32 csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __u32 sum)
{ {
unsigned long long s = (__force u32)sum; unsigned long long s = (__force u32)sum;
...@@ -204,13 +202,12 @@ __u32 csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __u3 ...@@ -204,13 +202,12 @@ __u32 csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __u3
* This function has been taken from * This function has been taken from
* Linux kernel include/asm-generic/checksum.h * Linux kernel include/asm-generic/checksum.h
*/ */
static inline __u16 static __u16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __u32 sum)
csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __u32 sum)
{ {
return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum)); return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
} }
static inline u16 udp_csum(u32 saddr, u32 daddr, u32 len, u8 proto, u16 *udp_pkt) static u16 udp_csum(u32 saddr, u32 daddr, u32 len, u8 proto, u16 *udp_pkt)
{ {
u32 csum = 0; u32 csum = 0;
u32 cnt = 0; u32 cnt = 0;
...@@ -500,7 +497,7 @@ static void kick_tx(struct xsk_socket_info *xsk) ...@@ -500,7 +497,7 @@ static void kick_tx(struct xsk_socket_info *xsk)
exit_with_error(errno); exit_with_error(errno);
} }
static inline void complete_tx_only(struct xsk_socket_info *xsk, int batch_size) static void complete_tx_only(struct xsk_socket_info *xsk, int batch_size)
{ {
unsigned int rcvd; unsigned int rcvd;
u32 idx; u32 idx;
...@@ -605,7 +602,7 @@ static void tx_only(struct xsk_socket_info *xsk, u32 *frameptr, int batch_size) ...@@ -605,7 +602,7 @@ static void tx_only(struct xsk_socket_info *xsk, u32 *frameptr, int batch_size)
complete_tx_only(xsk, batch_size); complete_tx_only(xsk, batch_size);
} }
static inline int get_batch_size(int pkt_cnt) static int get_batch_size(int pkt_cnt)
{ {
if (!opt_pkt_count) if (!opt_pkt_count)
return BATCH_SIZE; return BATCH_SIZE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment