[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

[firefly-linux-kernel-4.4.55.git] / net / sched / sch_teql.c

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 0968184ea6becc6f58ba848fc76c629aa8e26126..1411c7b1fbdc4de0f7103cfb559a78369a4195cc 100644 (file)
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -168,7 +168,7 @@ teql_destroy(struct Qdisc* sch)
        }
 }
 
-static int teql_qdisc_init(struct Qdisc *sch, struct rtattr *opt)
+static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt)
 {
        struct net_device *dev = sch->dev;
        struct teql_master *m = (struct teql_master*)sch->ops;
@@ -232,9 +232,12 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *
        }
        if (neigh_event_send(n, skb_res) == 0) {
                int err;
+
                read_lock(&n->lock);
-               err = dev->hard_header(skb, dev, ntohs(skb->protocol), n->ha, NULL, skb->len);
+               err = dev_hard_header(skb, dev, ntohs(skb->protocol),
+                                     n->ha, NULL, skb->len);
                read_unlock(&n->lock);
+
                if (err < 0) {
                        neigh_release(n);
                        return -EINVAL;
@@ -246,10 +249,13 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *
        return (skb_res == NULL) ? -EAGAIN : 1;
 }
 
-static __inline__ int
-teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *dev)
+static inline int teql_resolve(struct sk_buff *skb,
+                              struct sk_buff *skb_res, struct net_device *dev)
 {
-       if (dev->hard_header == NULL ||
+       if (dev->qdisc == &noop_qdisc)
+               return -ENODEV;
+
+       if (dev->header_ops == NULL ||
            skb->dst == NULL ||
            skb->dst->neighbour == NULL)
                return 0;
@@ -263,7 +269,7 @@ static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev)
        int busy;
        int nores;
        int len = skb->len;
-       int subq = skb->queue_mapping;
+       int subq = skb_get_queue_mapping(skb);
        struct sk_buff *skb_res = NULL;
 
        start = master->slaves;
@@ -281,7 +287,7 @@ restart:
                if (slave->qdisc_sleeping != q)
                        continue;
                if (netif_queue_stopped(slave) ||
-                   netif_subqueue_stopped(slave, subq) ||
+                   __netif_subqueue_stopped(slave, subq) ||
                    !netif_running(slave)) {
                        busy = 1;
                        continue;
@@ -291,7 +297,7 @@ restart:
                case 0:
                        if (netif_tx_trylock(slave)) {
                                if (!netif_queue_stopped(slave) &&
-                                   !netif_subqueue_stopped(slave, subq) &&
+                                   !__netif_subqueue_stopped(slave, subq) &&
                                    slave->hard_start_xmit(skb, slave) == 0) {
                                        netif_tx_unlock(slave);
                                        master->slaves = NEXT_SLAVE(q);
@@ -432,7 +438,6 @@ static __init void teql_master_setup(struct net_device *dev)
        dev->tx_queue_len       = 100;
        dev->flags              = IFF_NOARP;
        dev->hard_header_len    = LL_MAX_HEADER;
-       SET_MODULE_OWNER(dev);
 }
 
 static LIST_HEAD(master_dev_list);