From f8a2486c9c3da64dc07986480ff2ef901eb7ea37 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Fri, 23 Jul 2010 03:18:10 +0000 Subject: [PATCH] --- yaml --- r: 203693 b: refs/heads/master c: 451e07a26483f3234f1df6b1f60b949dab4e7719 h: refs/heads/master i: 203691: 42e5fd7bba521b83d0178e121ae6b99093f2b52b v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 36 ++++++++++++------------------------ 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 7d2c50afc2aa..8bae128e587d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 882d829a23756dd827d8ed30000f73f1b035ad29 +refs/heads/master: 451e07a26483f3234f1df6b1f60b949dab4e7719 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 24a19debda1b..10a1ea72010d 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -1434,18 +1434,12 @@ static ssize_t pktgen_if_write(struct file *file, i += len; for (*m = 0; *v && m < pkt_dev->dst_mac + 6; v++) { - if (*v >= '0' && *v <= '9') { - *m *= 16; - *m += *v - '0'; - } - if (*v >= 'A' && *v <= 'F') { - *m *= 16; - *m += *v - 'A' + 10; - } - if (*v >= 'a' && *v <= 'f') { - *m *= 16; - *m += *v - 'a' + 10; - } + int value; + + value = hex_to_bin(*v); + if (value >= 0) + *m = *m * 16 + value; + if (*v == ':') { m++; *m = 0; @@ -1476,18 +1470,12 @@ static ssize_t pktgen_if_write(struct file *file, i += len; for (*m = 0; *v && m < pkt_dev->src_mac + 6; v++) { - if (*v >= '0' && *v <= '9') { - *m *= 16; - *m += *v - '0'; - } - if (*v >= 'A' && *v <= 'F') { - *m *= 16; - *m += *v - 'A' + 10; - } - if (*v >= 'a' && *v <= 'f') { - *m *= 16; - *m += *v - 'a' + 10; - } + int value; + + value = hex_to_bin(*v); + if (value >= 0) + *m = *m * 16 + value; + if (*v == ':') { m++; *m = 0;