diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /include/linux/pkt_cls.h | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'include/linux/pkt_cls.h')
| -rw-r--r-- | include/linux/pkt_cls.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index 7f6ba8658abe..defbde203d07 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h | |||
| @@ -332,6 +332,7 @@ enum { | |||
| 332 | FLOW_KEY_SKUID, | 332 | FLOW_KEY_SKUID, |
| 333 | FLOW_KEY_SKGID, | 333 | FLOW_KEY_SKGID, |
| 334 | FLOW_KEY_VLAN_TAG, | 334 | FLOW_KEY_VLAN_TAG, |
| 335 | FLOW_KEY_RXHASH, | ||
| 335 | __FLOW_KEY_MAX, | 336 | __FLOW_KEY_MAX, |
| 336 | }; | 337 | }; |
| 337 | 338 | ||