diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/payload.h | 3 | ||||
| -rw-r--r-- | include/proto.h | 4 | ||||
| -rw-r--r-- | include/utils.h | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/payload.h b/include/payload.h index ca9b0138..9192d6e5 100644 --- a/include/payload.h +++ b/include/payload.h @@ -20,9 +20,8 @@ extern struct expr *payload_expr_join(const struct expr *e1, const struct expr *e2); bool payload_expr_trim(struct expr *expr, struct expr *mask, - const struct proto_ctx *ctx); + const struct proto_ctx *ctx, unsigned int *shift); extern void payload_expr_expand(struct list_head *list, struct expr *expr, - struct expr *mask, const struct proto_ctx *ctx); extern void payload_expr_complete(struct expr *expr, const struct proto_ctx *ctx); diff --git a/include/proto.h b/include/proto.h index 974116f1..d90bccd0 100644 --- a/include/proto.h +++ b/include/proto.h @@ -159,9 +159,9 @@ enum eth_hdr_fields { enum vlan_hdr_fields { VLANHDR_INVALID, - VLANHDR_VID, - VLANHDR_CFI, VLANHDR_PCP, + VLANHDR_CFI, + VLANHDR_VID, VLANHDR_TYPE, }; diff --git a/include/utils.h b/include/utils.h index e94ae81a..8a1dc5ef 100644 --- a/include/utils.h +++ b/include/utils.h @@ -69,6 +69,7 @@ #define field_sizeof(t, f) (sizeof(((t *)NULL)->f)) #define array_size(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) #define div_round_up(n, d) (((n) + (d) - 1) / (d)) +#define round_up(n, b) (div_round_up(n, b) * b) #define min(x, y) ({ \ typeof(x) _min1 = (x); \ |