Use NLMSG_TAIL

(Logical change 1.127)

diff --git a/tc/m_police.c b/tc/m_police.c
index 7c05b2d04184e82e813d439f3dd7f80d6f258f99..b1911a4b796a40d966c6412b1a2cb0d66a7404da 100644 (file)
--- a/tc/m_police.c
+++ b/tc/m_police.c
@@ -282,7 +282,7 @@ int act_parse_police(struct action_util *a,int *argc_p, char ***argv_p, int tca_
                p.peakrate.mpu = mpu;
        }
 
-       tail = (struct rtattr*)(((void*)n)+NLMSG_ALIGN(n->nlmsg_len));
+       tail = NLMSG_TAIL(n);
        addattr_l(n, MAX_MSG, tca_id, NULL, 0);
        addattr_l(n, MAX_MSG, TCA_POLICE_TBF, &p, sizeof(p));
        if (p.rate.rate)
@@ -294,7 +294,7 @@ int act_parse_police(struct action_util *a,int *argc_p, char ***argv_p, int tca_
        if (presult)
                addattr32(n, MAX_MSG, TCA_POLICE_RESULT, presult);
 
-       tail->rta_len = (((void*)n)+NLMSG_ALIGN(n->nlmsg_len)) - (void*)tail;
+       tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
        res = 0;
 
        *argc_p = argc;

diff --git a/tc/q_htb.c b/tc/q_htb.c
index 6a5a679edf53b90d50a8fd64b578898d637df680..abc4971503a38ae19c59e1934ffd1c3c8e20aee4 100644 (file)
--- a/tc/q_htb.c
+++ b/tc/q_htb.c
@@ -93,10 +93,10 @@ static int htb_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
                }
                argc--; argv++;
        }
-       tail = (struct rtattr*)(((void*)n)+NLMSG_ALIGN(n->nlmsg_len));
+       tail = NLMSG_TAIL(n);
        addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
        addattr_l(n, 2024, TCA_HTB_INIT, &opt, NLMSG_ALIGN(sizeof(opt)));
-       tail->rta_len = (((void*)n)+NLMSG_ALIGN(n->nlmsg_len)) - (void*)tail;
+       tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
        return 0;
 }
 
@@ -224,12 +224,12 @@ static int htb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, str
        opt.cbuffer = tc_calc_xmittime(opt.ceil.rate, cbuffer);
        opt.ceil.cell_log = ccell_log;
 
-       tail = (struct rtattr*)(((void*)n)+NLMSG_ALIGN(n->nlmsg_len));
+       tail = NLMSG_TAIL(n);
        addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
        addattr_l(n, 2024, TCA_HTB_PARMS, &opt, sizeof(opt));
        addattr_l(n, 3024, TCA_HTB_RTAB, rtab, 1024);
        addattr_l(n, 4024, TCA_HTB_CTAB, ctab, 1024);
-       tail->rta_len = (((void*)n)+NLMSG_ALIGN(n->nlmsg_len)) - (void*)tail;
+       tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
        return 0;
 }