can-next pull request for CAN ID Ematch
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: 2012-07-04 04:11:45
Subsystem:
can network layer, networking [general], tc subsystem, the rest · Maintainers:
Oliver Hartkopp, Marc Kleine-Budde, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jamal Hadi Salim, Jiri Pirko, Linus Torvalds
Hello Marc, hello Rostislav, as Rostislav seems to be absent, i fixed the minor issues myself and created a branch for that in my ollis-can-next git repo. FYI the changes can be seen in the patch at the end of this mail. The following changes since commit 0e1aa9cfe6db4689f98b20afe808b4f9cdb0b6c0: em_canid: Ematch rule to match CAN frames according to their identifiers (2012-07-04 05:32:03 +0200) are available in the git repository at: git://gitorious.org/~hartkopp/linux-can/ollis-can-next.git em_can for you to fetch changes up to 0e1aa9cfe6db4689f98b20afe808b4f9cdb0b6c0: em_canid: Ematch rule to match CAN frames according to their identifiers (2012-07-04 05:32:03 +0200)
diff --git a/net/sched/em_canid.c b/net/sched/em_canid.c
index d607e78..dc9f515 100644
--- a/net/sched/em_canid.c
+++ b/net/sched/em_canid.c@@ -123,13 +123,10 @@ static int em_canid_match(struct sk_buff *skb, struct tcf_ematch *m, static int em_canid_change(struct tcf_proto *tp, void *data, int len, struct tcf_ematch *m) { - struct can_filter *conf = data; /* Array with rules, - * fixed size EM_CAN_RULES_SIZE - */ + struct can_filter *conf = data; /* Array with rules */ struct canid_match *cm; struct canid_match *cm_old = (struct canid_match *)m->data; int i; - int rulescnt; if (!len) return -EINVAL;
@@ -140,43 +137,37 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len, if (len > sizeof(struct can_filter) * EM_CAN_RULES_MAX) return -EINVAL; - rulescnt = len / sizeof(struct can_filter); - - cm = kzalloc(sizeof(struct canid_match) + sizeof(struct can_filter) * - rulescnt, GFP_KERNEL); + cm = kzalloc(sizeof(struct canid_match) + len, GFP_KERNEL); if (!cm) return -ENOMEM; - cm->sff_rules_count = 0; - cm->eff_rules_count = 0; - cm->rules_count = rulescnt; + cm->rules_count = len / sizeof(struct can_filter); /* * We need two for() loops for copying rules into * two contiguous areas in rules_raw */ - /* Process EFF frame rules*/ + /* Process EFF and mixed EFF/SFF frame rules*/ for (i = 0; i < cm->rules_count; i++) { - if (((conf[i].can_id & CAN_EFF_FLAG) && - (conf[i].can_mask & CAN_EFF_FLAG)) || - !(conf[i].can_mask & CAN_EFF_FLAG)) { + if (!(conf[i].can_id & CAN_EFF_FLAG) && + (conf[i].can_mask & CAN_EFF_FLAG)) { + /* SFF only filter */ + continue; + } else { memcpy(cm->rules_raw + cm->eff_rules_count, &conf[i], sizeof(struct can_filter)); cm->eff_rules_count++; - } else { - continue; } } /* Process SFF frame rules */ for (i = 0; i < cm->rules_count; i++) { - if ((conf[i].can_id & CAN_EFF_FLAG) && + if (!(conf[i].can_id & CAN_EFF_FLAG) && (conf[i].can_mask & CAN_EFF_FLAG)) { - continue; - } else { + /* SFF only filter */ memcpy(cm->rules_raw + cm->eff_rules_count + cm->sff_rules_count,
@@ -186,10 +177,12 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len, em_canid_sff_match_add(cm, conf[i].can_id, conf[i].can_mask); + } else { + continue; } } - m->datalen = sizeof(*cm); + m->datalen = sizeof(struct canid_match) + len; m->data = (unsigned long)cm; if (cm_old != NULL) {