projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[linux-2.6-block.git]
/
include
/
linux
/
pkt_cls.h
diff --git
a/include/linux/pkt_cls.h
b/include/linux/pkt_cls.h
index 25d2d67c1faf813cde122f8a1df121c513d2112d..c3f01b3085a410ac9334fd993d8ee4cd38ed339e 100644
(file)
--- a/
include/linux/pkt_cls.h
+++ b/
include/linux/pkt_cls.h
@@
-276,6
+276,7
@@
struct tc_rsvp_pinfo
__u8 protocol;
__u8 tunnelid;
__u8 tunnelhdr;
+ __u8 pad;
};
/* ROUTE filter */
@@
-304,6
+305,7
@@
enum
TCA_FW_POLICE,
TCA_FW_INDEV, /* used by CONFIG_NET_CLS_IND */
TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
+ TCA_FW_MASK,
__TCA_FW_MAX
};