From fc3fd7ac87dd09a192ba48bd526be648108c3010 Mon Sep 17 00:00:00 2001 From: Denis Cheng Date: Sun, 16 Sep 2007 16:41:29 -0700 Subject: [PATCH] --- yaml --- r: 66613 b: refs/heads/master c: 8b14a536701b50559a0d69d5d593323f550db4e9 h: refs/heads/master i: 66611: 1065a002c281de5321e952b03ded492e11d8a504 v: v3 --- [refs] | 2 +- trunk/net/atm/proc.c | 2 +- trunk/net/decnet/dn_dev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c62d9d4b398f..95e99074e61f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c40f6fff401f693f627d3d44ef7663b993943517 +refs/heads/master: 8b14a536701b50559a0d69d5d593323f550db4e9 diff --git a/trunk/net/atm/proc.c b/trunk/net/atm/proc.c index 3a6be64b0512..5d9d5ffba145 100644 --- a/trunk/net/atm/proc.c +++ b/trunk/net/atm/proc.c @@ -176,7 +176,7 @@ static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) seq_printf(seq, "%3d %3d %5d %-3s %7d %-5s %7d %-6s", vcc->dev->number,vcc->vpi,vcc->vci, - vcc->qos.aal >= sizeof(aal_name)/sizeof(aal_name[0]) ? "err" : + vcc->qos.aal >= ARRAY_SIZE(aal_name) ? "err" : aal_name[vcc->qos.aal],vcc->qos.rxtp.min_pcr, class_name[vcc->qos.rxtp.traffic_class],vcc->qos.txtp.min_pcr, class_name[vcc->qos.txtp.traffic_class]); diff --git a/trunk/net/decnet/dn_dev.c b/trunk/net/decnet/dn_dev.c index ddfd2aff44d8..fa24614b5a37 100644 --- a/trunk/net/decnet/dn_dev.c +++ b/trunk/net/decnet/dn_dev.c @@ -150,7 +150,7 @@ static struct dn_dev_parms dn_dev_list[] = { } }; -#define DN_DEV_LIST_SIZE (sizeof(dn_dev_list)/sizeof(struct dn_dev_parms)) +#define DN_DEV_LIST_SIZE ARRAY_SIZE(dn_dev_list) #define DN_DEV_PARMS_OFFSET(x) ((int) ((char *) &((struct dn_dev_parms *)0)->x))