em_canid: Fix correct EFF_FLAG setting

diff --git a/tc/em_canid.c b/tc/em_canid.c
index 8ec78b817402f099abb4ca2621d8c48186fd7cc4..1590b94e96c7c4d953feb6b03ef233481861faaf 100644 (file)
--- a/tc/em_canid.c
+++ b/tc/em_canid.c
@@ -56,7 +56,7 @@ static int canid_parse_rule(struct can_filter *rule, struct bstr *a, int iseff)
                }
        }
        rule->can_id = can_id | ((iseff) ? CAN_EFF_FLAG : 0);
-       rule->can_mask = can_mask | ((iseff) ? CAN_EFF_FLAG : 0);
+       rule->can_mask = can_mask | CAN_EFF_FLAG;
 
        return 0;
 }
@@ -155,13 +155,13 @@ static int canid_print_eopt(FILE *fd, struct tcf_ematch_hdr *hdr, void *data,
                                                pcfltr->can_id & CAN_EFF_MASK,
                                                pcfltr->can_mask & CAN_EFF_MASK);
                } else {
-                       if (pcfltr->can_mask == CAN_SFF_MASK)
+                       if (pcfltr->can_mask == (CAN_EFF_FLAG|CAN_SFF_MASK))
                                fprintf(fd, "sff 0x%"PRIX32,
-                                               pcfltr->can_id);
+                                               pcfltr->can_id & CAN_SFF_MASK);
                        else
                                fprintf(fd, "sff 0x%"PRIX32":0x%"PRIX32,
-                                               pcfltr->can_id,
-                                               pcfltr->can_mask);
+                                               pcfltr->can_id & CAN_SFF_MASK,
+                                               pcfltr->can_mask & CAN_SFF_MASK);
                }
 
                if ((i + 1) < rules_count)