Copy of 2.6.9-rc2

(Logical change 1.73)

include/linux/pkt_sched.h

@@ -401,7 +401,16 @@ enum {
 
 #define TCA_ATM_MAX	TCA_ATM_STATE
 
-/* Network section */
+/* Network emulator */
+
+enum
+{
+	TCA_NETEM_UNSPEC,
+	TCA_NETEM_CORR,
+	TCA_NETEM_DELAY_DIST,
+};
+
+#define TCA_NETEM_MAX	TCA_NETEM_DELAY_DIST
 
 struct tc_netem_qopt
 {
@@ -410,14 +419,16 @@ struct tc_netem_qopt
 	__u32	loss;		/* random packet loss (0=none ~0=100%) */
 	__u32	gap;		/* re-ordering gap (0 for delay all) */
 	__u32   duplicate;	/* random packet dup  (0=none ~0=100%) */
-	__u32	jitter;		/* delay sigma (us) */
-
-	__u32	delay_corr;	/* delay correllation (0=none ~0=100%) */
-	__u32	loss_corr;	/* packet loss correllation (0=none ~0=100%) */
-	__u32	dup_corr;	/* duplicate correlation (0=none ~0=100%) */
+	__u32	jitter;		/* random jitter in latency (us) */
+};
 
-	__s16	delay_dist[0];	/* delay distribution table (optional) */
-#define TCA_NETEM_TABLEFACTOR	8192
+struct tc_netem_corr
+{
+	__u32	delay_corr;	/* delay correlation */
+	__u32	loss_corr;	/* packet loss correlation */
+	__u32	dup_corr;	/* duplicate correlation  */
 };
 
+#define NETEM_DIST_SCALE	8192
+
 #endif