projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
[powerpc.git]
/
include
/
linux
/
pkt_sched.h
diff --git
a/include/linux/pkt_sched.h
b/include/linux/pkt_sched.h
index
1d9da36
..
60ffcb9
100644
(file)
--- a/
include/linux/pkt_sched.h
+++ b/
include/linux/pkt_sched.h
@@
-221,9
+221,11
@@
struct tc_gred_qopt
/* gred setup */
struct tc_gred_sopt
{
/* gred setup */
struct tc_gred_sopt
{
- __u32 DPs;
- __u32 def_DP;
- __u8 grio;
+ __u32 DPs;
+ __u32 def_DP;
+ __u8 grio;
+ __u8 pad1;
+ __u16 pad2;
};
/* HTB section */
};
/* HTB section */
@@
-351,6
+353,7
@@
struct tc_cbq_ovl
#define TC_CBQ_OVL_DROP 3
#define TC_CBQ_OVL_RCLASSIC 4
unsigned char priority2;
#define TC_CBQ_OVL_DROP 3
#define TC_CBQ_OVL_RCLASSIC 4
unsigned char priority2;
+ __u16 pad;
__u32 penalty;
};
__u32 penalty;
};