diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-25 09:23:20 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-25 09:23:20 -0300 |
| commit | 2c5d606613e689da610e2c52378d442242e0ac96 (patch) | |
| tree | 0b1b096dd6762e4326d3feaeb6608005ea13c297 /sys/netgraph | |
| parent | 4086c05f7861aa04b39aaee3978cbeeaff67a764 (diff) | |
| parent | 2c5612e0c5230fe1c56c42e5a22807eb8c14e562 (diff) | |
| download | FreeBSD-src-2c5d606613e689da610e2c52378d442242e0ac96.zip FreeBSD-src-2c5d606613e689da610e2c52378d442242e0ac96.tar.gz | |
Merge remote-tracking branch 'origin/master' into devel-11
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/atm/ng_atm.c | 2 | ||||
| -rw-r--r-- | sys/netgraph/bluetooth/socket/ng_btsocket.c | 5 | ||||
| -rw-r--r-- | sys/netgraph/ng_gif_demux.c | 2 | ||||
| -rw-r--r-- | sys/netgraph/ng_iface.c | 2 | ||||
| -rw-r--r-- | sys/netgraph/ng_socket.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c index ef168ac..c0a7032 100644 --- a/sys/netgraph/atm/ng_atm.c +++ b/sys/netgraph/atm/ng_atm.c @@ -872,7 +872,7 @@ text_status(node_p node, char *arg, u_int len) sbuf_new(&sbuf, arg, len, SBUF_FIXEDLEN); sbuf_printf(&sbuf, "interface: %s\n", priv->ifp->if_xname); - if (mib->device >= sizeof(devices) / sizeof(devices[0])) + if (mib->device >= nitems(devices)) sbuf_printf(&sbuf, "device=unknown\nvendor=unknown\n"); else sbuf_printf(&sbuf, "device=%s\nvendor=%s\n", diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c index d0f1246..7190074 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c @@ -213,10 +213,9 @@ static struct protosw ng_btsocket_protosw[] = { .pr_usrreqs = &ng_btsocket_sco_usrreqs, }, }; -#define ng_btsocket_protosw_size \ - (sizeof(ng_btsocket_protosw)/sizeof(ng_btsocket_protosw[0])) + #define ng_btsocket_protosw_end \ - &ng_btsocket_protosw[ng_btsocket_protosw_size] + &ng_btsocket_protosw[nitems(ng_btsocket_protosw)] /* * BLUETOOTH domain diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c index ce0fba0..0a0644e 100644 --- a/sys/netgraph/ng_gif_demux.c +++ b/sys/netgraph/ng_gif_demux.c @@ -111,7 +111,7 @@ const static struct iffam gFamilies[] = { { AF_ATM, NG_GIF_DEMUX_HOOK_ATM }, { AF_NATM, NG_GIF_DEMUX_HOOK_NATM }, }; -#define NUM_FAMILIES (sizeof(gFamilies) / sizeof(*gFamilies)) +#define NUM_FAMILIES nitems(gFamilies) /* Per-node private data */ struct ng_gif_demux_private { diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index a38ab9c..c6e659c 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -106,7 +106,7 @@ const static struct iffam gFamilies[] = { { AF_ATM, NG_IFACE_HOOK_ATM }, { AF_NATM, NG_IFACE_HOOK_NATM }, }; -#define NUM_FAMILIES (sizeof(gFamilies) / sizeof(*gFamilies)) +#define NUM_FAMILIES nitems(gFamilies) /* Node private data */ struct ng_iface_private { diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 76d6383..08ee763 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -1163,7 +1163,7 @@ struct domain ngdomain = { .dom_family = AF_NETGRAPH, .dom_name = "netgraph", .dom_protosw = ngsw, - .dom_protoswNPROTOSW = &ngsw[sizeof(ngsw) / sizeof(ngsw[0])] + .dom_protoswNPROTOSW = &ngsw[nitems(ngsw)] }; /* |
