diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2017-06-05 12:31:52 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-06-05 12:31:52 -0700 |
| commit | d9bcafb4fe2e066e2c597b5b32356ed3f2b12bda (patch) | |
| tree | f5aedadf8aa726abe92f0f0a401cbcfe6c18ad86 | |
| parent | a5445c56e1b07d1fd29df30adfdf151bfc42a811 (diff) | |
| download | iproute2-d9bcafb4fe2e066e2c597b5b32356ed3f2b12bda.tar.gz | |
updated headers from net-next
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | include/linux/bpf.h | 11 | ||||
| -rw-r--r-- | include/linux/pkt_cls.h | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index d322ca15..23fe1b64 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -313,8 +313,11 @@ union bpf_attr { * @flags: room for future extensions * Return: 0 on success or negative error * - * u64 bpf_perf_event_read(&map, index) - * Return: Number events read or error code + * u64 bpf_perf_event_read(map, flags) + * read perf event counter value + * @map: pointer to perf_event_array map + * @flags: index of event in the map or bitmask flags + * Return: value of perf event counter read or error code * * int bpf_redirect(ifindex, flags) * redirect to another netdev @@ -328,11 +331,11 @@ union bpf_attr { * @skb: pointer to skb * Return: realm if != 0 * - * int bpf_perf_event_output(ctx, map, index, data, size) + * int bpf_perf_event_output(ctx, map, flags, data, size) * output perf raw sample * @ctx: struct pt_regs* * @map: pointer to perf_event_array map - * @index: index of event in the map + * @flags: index of event in the map or bitmask flags * @data: data on stack to be output as raw data * @size: size of data * Return: 0 on success or negative error diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index c6e8cf5e..edf43ddf 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -454,6 +454,11 @@ enum { TCA_FLOWER_KEY_TCP_FLAGS, /* be16 */ TCA_FLOWER_KEY_TCP_FLAGS_MASK, /* be16 */ + TCA_FLOWER_KEY_IP_TOS, /* u8 */ + TCA_FLOWER_KEY_IP_TOS_MASK, /* u8 */ + TCA_FLOWER_KEY_IP_TTL, /* u8 */ + TCA_FLOWER_KEY_IP_TTL_MASK, /* u8 */ + __TCA_FLOWER_MAX, }; |