/* * Range add and subtract */ #include #include #include #include #include int add_range(struct range *range, int az, int nr_range, u64 start, u64 end) { if (start >= end) return nr_range; /* Out of slots: */ if (nr_range >= az) return nr_range; range[nr_range].start = start; range[nr_range].end = end; nr_range++; return nr_range; } int add_range_with_merge(struct range *range, int az, int nr_range, u64 start, u64 end) { int i; if (start >= end) return nr_range; /* get new start/end: */ for (i = 0; i < nr_range; i++) { u64 common_start, common_end; if (!range[i].end) continue; common_start = max(range[i].start, start); common_end = min(range[i].end, end); if (common_start > common_end) continue; /* new start/end, will add it back at last */ start = min(range[i].start, start); end = max(range[i].end, end); memmove(&range[i], &range[i + 1], (nr_range - (i + 1)) * sizeof(range[i])); range[nr_range - 1].start = 0; range[nr_range - 1].end = 0; nr_range--; i--; } /* Need to add it: */ return add_range(range, az, nr_range, start, end); } void subtract_range(struct range *range, int az, u64 start, u64 end) { int i, j; if (start >= end) return; for (j = 0; j < az; j++) { if (!range[j].end) continue; if (start <= range[j].start && end >= range[j].end) { range[j].start = 0; range[j].end = 0; continue; } if (start <= range[j].start && end < range[j].end && range[j].start < end) { range[j].start = end; continue; } if (start > range[j].start && end >= range[j].end && range[j].end > start) { range[j].end = start; continue; } if (start > range[j].start && end < range[j].end) { /* Find the new spare: */ for (i = 0; i < az; i++) { if (range[i].end == 0) break; } if (i < az) { range[i].end = range[j].end; range[i].start = end; } else { pr_err("%s: run out of slot in ranges\n", __func__); } range[j].end = start; continue; } } } static int cmp_range(const void *x1, const void *x2) { const struct range *r1 = x1; const struct range *r2 = x2; if (r1->start < r2->start) return -1; if (r1->start > r2->start) return 1; return 0; } int clean_sort_range(struct range *range, int az) { int i, j, k = az - 1, nr_range = az; for (i = 0; i < k; i++) { if (range[i].end) continue; for (j = k; j > i; j--) { if (range[j].end) { k = j; break; } } if (j == i) break; range[i].start = range[k].start; range[i].end = range[k].end; range[k].start = 0; range[k].end = 0; k--; } /* count it */ for (i = 0; i < az; i++) { if (!range[i].end) { nr_range = i; break; } } /* sort them */ sort(range, nr_range, sizeof(struct range), cmp_range, NULL); return nr_range; } void sort_range(struct range *range, int nr_range) { /* sort them */ sort(range, nr_range, sizeof(struct range), cmp_range, NULL); } inux/net-next.git/commit/include/dt-bindings?id=040587af31228d82c52267f717c9fcdb65f36335'>dt-bindings/clock/r7s72100-clock.h
diff options
context:
space:
mode:
authorSimon Horman <simon.horman@netronome.com>2017-01-30 16:19:02 +0100
committerDavid S. Miller <davem@davemloft.net>2017-01-30 16:42:09 -0500
commit040587af31228d82c52267f717c9fcdb65f36335 (patch)
treeb681c1594f967396fcf3ce80f17444183bb37900 /include/dt-bindings/clock/r7s72100-clock.h
parent0d29ed28da63dd893395c343c7e78b078de93ceb (diff)
net/sched: cls_flower: Correct matching on ICMPv6 code
When matching on the ICMPv6 code ICMPV6_CODE rather than ICMPV4_CODE attributes should be used. This corrects what appears to be a typo. Sample usage: tc qdisc add dev eth0 ingress tc filter add dev eth0 protocol ipv6 parent ffff: flower \ indev eth0 ip_proto icmpv6 type 128 code 0 action drop Without this change the code parameter above is effectively ignored. Fixes: 7b684884fbfa ("net/sched: cls_flower: Support matching on ICMP type and code") Signed-off-by: Simon Horman <simon.horman@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/dt-bindings/clock/r7s72100-clock.h')