diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /include/linux/pkt_cls.h | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
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 */ |