diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
tree | 7064703c5d63d44700085cd701703457730bc06e /include/linux/pkt_sched.h | |
parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/pkt_sched.h')
-rw-r--r-- | include/linux/pkt_sched.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index e3f133adba7..b2648e8e498 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef __LINUX_PKT_SCHED_H | 1 | #ifndef __LINUX_PKT_SCHED_H |
2 | #define __LINUX_PKT_SCHED_H | 2 | #define __LINUX_PKT_SCHED_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | /* Logical priority bands not depending on specific packet scheduler. | 6 | /* Logical priority bands not depending on specific packet scheduler. |
5 | Every scheduler will map them to real traffic classes, if it has | 7 | Every scheduler will map them to real traffic classes, if it has |
6 | no more precise mechanism to classify packets. | 8 | no more precise mechanism to classify packets. |