new API changes
Change-Id: I0c07d851c9074900869bc4c01cc0f37c7c2ef5f6
Signed-off-by: Abhishek Rastogi <rastogiabhi@codeaurora.org>
(cherry picked from commit 6a6a08b6b7a753f434428cf8ebff8e0f23cfcd9b)
diff --git a/nss_qdisc.c b/nss_qdisc.c
index bd1a41f..cbb0ef2 100755
--- a/nss_qdisc.c
+++ b/nss_qdisc.c
@@ -365,7 +365,7 @@
* If the interface is known to NSS then we will have to shape it.
* Irrespective of whether it has an interface qdisc or not.
*/
- nss_if_num = nss_get_interface_number(nq->nss_shaping_ctx, dev);
+ nss_if_num = nss_cmn_get_interface_number(nq->nss_shaping_ctx, dev);
if (nss_if_num < 0) {
goto nextdev;
}
@@ -1535,7 +1535,7 @@
* NOTE: This will still work where the dev is registered as virtual, in which case
* nss_interface_number shall indicate a virtual NSS interface.
*/
- nq->nss_interface_number = nss_get_interface_number(nq->nss_shaping_ctx, dev);
+ nq->nss_interface_number = nss_cmn_get_interface_number(nq->nss_shaping_ctx, dev);
if (nq->nss_interface_number < 0) {
nssqdisc_error("%s: Qdisc %p (type %d) net device unknown to "
"nss driver %s\n", __func__, sch, nq->type, dev->name);
@@ -1649,7 +1649,7 @@
* NOTE: This will still work where the dev is registered as virtual, in which case
* nss_interface_number shall indicate a virtual NSS interface.
*/
- nq->nss_interface_number = nss_get_interface_number(nq->nss_shaping_ctx, dev);
+ nq->nss_interface_number = nss_cmn_get_interface_number(nq->nss_shaping_ctx, dev);
if (nq->nss_interface_number < 0) {
nssqdisc_error("%s: Qdisc %p (type %d): interface unknown to nss driver %s\n",
__func__, sch, nq->type, dev->name);
@@ -1662,7 +1662,7 @@
* Is the interface virtual or not?
* NOTE: If this interface is virtual then we have to bounce packets to it for shaping
*/
- nq->is_virtual = nss_interface_is_virtual(nq->nss_shaping_ctx, nq->nss_interface_number);
+ nq->is_virtual = nss_cmn_interface_is_virtual(nq->nss_shaping_ctx, nq->nss_interface_number);
if (!nq->is_virtual) {
nssqdisc_info("%s: Qdisc %p (type %d): interface %u is physical\n",
__func__, sch, nq->type, nq->nss_interface_number);
@@ -1897,7 +1897,7 @@
nssqdisc_info("Reveived NETDEV_BR_LEAVE on interface %s\n",
dev->name);
br = dev->master;
- if_num = nss_get_interface_number(nssqdisc_ctx, dev);
+ if_num = nss_cmn_get_interface_number(nssqdisc_ctx, dev);
if (br == NULL || br->priv_flags != IFF_EBRIDGE) {
nssqdisc_error("Sensed bridge activity on interface %s "
@@ -1905,7 +1905,7 @@
break;
}
- br_num = nss_get_interface_number(nssqdisc_ctx, br);
+ br_num = nss_cmn_get_interface_number(nssqdisc_ctx, br);
br_qdisc = br->qdisc;
/*
* TODO: Properly ensure that the interface and bridge are
@@ -2099,7 +2099,7 @@
return nla_nest_end(skb, opts);
-nla_put_failure:
+nla_put_failure:
nla_nest_cancel(skb, opts);
return -EMSGSIZE;
}
@@ -2446,7 +2446,7 @@
return -EINVAL;
}
-
+
/*
* Rate can be zero. Therefore we dont do a check on it.
*/
@@ -2533,7 +2533,7 @@
nla_put_failure:
nla_nest_cancel(skb, opts);
- return -EMSGSIZE;
+ return -EMSGSIZE;
}
static int nsstbl_dump_class(struct Qdisc *sch, unsigned long cl,
@@ -2771,7 +2771,7 @@
{
struct nssprio_sched_data *q = qdisc_priv(sch);
struct nlattr *opts = NULL;
- struct tc_nssprio_qopt qopt;
+ struct tc_nssprio_qopt qopt;
nssqdisc_info("Nssprio dumping");
qopt.bands = q->bands;
@@ -2784,7 +2784,7 @@
nla_put_failure:
nla_nest_cancel(skb, opts);
- return -EMSGSIZE;
+ return -EMSGSIZE;
}
static int nssprio_graft(struct Qdisc *sch, unsigned long arg,