Skip to content

Commit 3c861d1

Browse files
committed
fix gen check
Signed-off-by: 072020127 <mhy200253@gmail.com>
1 parent 871e4cf commit 3c861d1

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

bpf/include/inner_map_defs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
typedef enum { MAP_TYPE_64, MAP_TYPE_192, MAP_TYPE_296, MAP_TYPE_1600, MAP_TYPE_MAX } map_in_map_type;
1111

1212
#define MAP_GET_TYPE(idx) (__u8)((__u32)(idx) >> 24)
13-
#define MAP_GET_INDEX(idx) (__u32)((__u32)(idx)&0xFFFFFF)
14-
#define MAP_GEN_OUTER_KEY(map_type, pos) ((__u32)((((__u8)(map_type)&0xFF) << 24) + ((__u32)(pos)&0xFFFFFF)))
13+
#define MAP_GET_INDEX(idx) (__u32)((__u32)(idx) & 0xFFFFFF)
14+
#define MAP_GEN_OUTER_KEY(map_type, pos) ((__u32)((((__u8)(map_type) & 0xFF) << 24) + ((__u32)(pos) & 0xFFFFFF)))
1515

1616
#define MAP_VAL_SIZE_64 64
1717
#define MAP_VAL_SIZE_192 192

bpf/kmesh/ads/include/kmesh_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ enum kmesh_l7_msg_type { MSG_UNKNOW = 0, MSG_REQUEST, MSG_MID_REPONSE, MSG_FINAL
8484
enum kmesh_strncmp_type { STRNCMP_FAILED = 0, STRNCMP_PREFIX, STRNCMP_EXACT };
8585

8686
#define KMESH_PROTO_TYPE_WIDTH (8)
87-
#define GET_RET_PROTO_TYPE(n) ((n)&0xff)
87+
#define GET_RET_PROTO_TYPE(n) ((n) & 0xff)
8888
#define GET_RET_MSG_TYPE(n) (((n) >> KMESH_PROTO_TYPE_WIDTH) & 0xff)
8989

9090
#define CHECK_MODULE_NAME_NULL(ret) ((ret) == -EINVAL)

kernel/ko_src/kmesh/kmesh_parse_protocol_data.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ enum kmesh_strncmp_type { STRNCMP_FAILED = 0, STRNCMP_PREFIX, STRNCMP_EXACT };
2727

2828
#define KMESH_PROTO_TYPE_WIDTH (8)
2929

30-
#define SET_RET_PROTO_TYPE(n, type) (n) = (((n)&0xff00) | ((u32)(type)&0xff))
31-
#define GET_RET_PROTO_TYPE(n) ((n)&0xff)
30+
#define SET_RET_PROTO_TYPE(n, type) (n) = (((n) & 0xff00) | ((u32)(type) & 0xff))
31+
#define GET_RET_PROTO_TYPE(n) ((n) & 0xff)
3232

33-
#define SET_RET_MSG_TYPE(n, type) (n) = (((n)&0xff) | (((u32)(type)&0xff) << KMESH_PROTO_TYPE_WIDTH))
33+
#define SET_RET_MSG_TYPE(n, type) (n) = (((n) & 0xff) | (((u32)(type) & 0xff) << KMESH_PROTO_TYPE_WIDTH))
3434
#define GET_RET_MSG_TYPE(n) (((n) >> KMESH_PROTO_TYPE_WIDTH) & 0xff)
3535

3636
#define LOG(level, fmt, ...) printk(level "Kmesh_module: " fmt, ##__VA_ARGS__)

0 commit comments

Comments
 (0)