diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /include/linux/pkt_sched.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'include/linux/pkt_sched.h')
| -rw-r--r-- | include/linux/pkt_sched.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index d10f35338507..268c51599eb8 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h | |||
| @@ -101,6 +101,15 @@ struct tc_prio_qopt | |||
| 101 | __u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */ | 101 | __u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */ |
| 102 | }; | 102 | }; |
| 103 | 103 | ||
| 104 | enum | ||
| 105 | { | ||
| 106 | TCA_PRIO_UNSPEC, | ||
| 107 | TCA_PRIO_MQ, | ||
| 108 | __TCA_PRIO_MAX | ||
| 109 | }; | ||
| 110 | |||
| 111 | #define TCA_PRIO_MAX (__TCA_PRIO_MAX - 1) | ||
| 112 | |||
| 104 | /* TBF section */ | 113 | /* TBF section */ |
| 105 | 114 | ||
| 106 | struct tc_tbf_qopt | 115 | struct tc_tbf_qopt |