Commit e94e24d5 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

[PKT_SCHED]: Move tc_u32_mark into pkt_cls.h

The tc_u32_mark structure is used as part of the netlink message
from the user API to the kernel, so it needs to be moved to
include/linux/pkt_cls.h and have types changed from u32 to __u32.

Also, the definition of u32 performance counters doesn't need to depend
on the config option.  The definition can exist even if the code isn't
enabled.
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a311d61
...@@ -221,14 +221,20 @@ struct tc_u32_sel ...@@ -221,14 +221,20 @@ struct tc_u32_sel
struct tc_u32_key keys[0]; struct tc_u32_key keys[0];
}; };
#ifdef CONFIG_CLS_U32_PERF struct tc_u32_mark
{
__u32 val;
__u32 mask;
__u32 success;
};
struct tc_u32_pcnt struct tc_u32_pcnt
{ {
__u64 rcnt; __u64 rcnt;
__u64 rhit; __u64 rhit;
__u64 kcnts[0]; __u64 kcnts[0];
}; };
#endif
/* Flags */ /* Flags */
#define TC_U32_TERMINAL 1 #define TC_U32_TERMINAL 1
......
...@@ -58,14 +58,6 @@ ...@@ -58,14 +58,6 @@
#include <net/act_api.h> #include <net/act_api.h>
#include <net/pkt_cls.h> #include <net/pkt_cls.h>
struct tc_u32_mark
{
u32 val;
u32 mask;
u32 success;
};
struct tc_u_knode struct tc_u_knode
{ {
struct tc_u_knode *next; struct tc_u_knode *next;
......
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