diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
| commit | a839688362e32f01608838516036697e30618b39 (patch) | |
| tree | a174d93d568ba9735b13bb6ebb5f1a36c8f56308 /include/linux/pkt_cls.h | |
| parent | 2fa938b8a3964c21b23d9d095091e7abc88249c5 (diff) | |
| parent | 12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
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 25d2d67c1faf..bd2c5a2bbbf5 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h | |||
| @@ -276,6 +276,7 @@ struct tc_rsvp_pinfo | |||
| 276 | __u8 protocol; | 276 | __u8 protocol; |
| 277 | __u8 tunnelid; | 277 | __u8 tunnelid; |
| 278 | __u8 tunnelhdr; | 278 | __u8 tunnelhdr; |
| 279 | __u8 pad; | ||
| 279 | }; | 280 | }; |
| 280 | 281 | ||
| 281 | /* ROUTE filter */ | 282 | /* ROUTE filter */ |