Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index e87b233615b3..d10f35338507 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -429,6 +429,7 @@ enum
         TCA_NETEM_CORR,
         TCA_NETEM_DELAY_DIST,
         TCA_NETEM_REORDER,
+        TCA_NETEM_CORRUPT,
         __TCA_NETEM_MAX,
 };
 
@@ -457,6 +458,12 @@ struct tc_netem_reorder
         __u32   correlation;
 };
 
+struct tc_netem_corrupt
+{
+        __u32   probability;
+        __u32   correlation;
+};
+
 #define NETEM_DIST_SCALE        8192
 
 #endif