diff --git a/[refs] b/[refs] index bc6937240dce..07b6d8c92eb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1e284a4bd827db2288af9536664b44590e419eb +refs/heads/master: 98e56405521b74b4826f855d45ef7859f34548ff diff --git a/trunk/net/sched/em_meta.c b/trunk/net/sched/em_meta.c index ed2a46cbb67f..48bb23c2a35a 100644 --- a/trunk/net/sched/em_meta.c +++ b/trunk/net/sched/em_meta.c @@ -639,9 +639,9 @@ static int meta_int_compare(struct meta_obj *a, struct meta_obj *b) /* Let gcc optimize it, the unlikely is not really based on * some numbers but jump free code for mismatches seems * more logical. */ - if (unlikely(a == b)) + if (unlikely(a->value == b->value)) return 0; - else if (a < b) + else if (a->value < b->value) return -1; else return 1;