1 files changed, 14 insertions, 22 deletions

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 5c6ffdb77d2d..ebf94edf0478 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -29,9 +29,10 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
-#include <linux/rtnetlink.h>
 #include <linux/init.h>
 #include <linux/kmod.h>
+#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
 #include <net/pkt_cls.h>
@@ -323,7 +324,7 @@ tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, unsigned long fh,
 {
         struct tcmsg *tcm;
         struct nlmsghdr  *nlh;
-        unsigned char    *b = skb->tail;
+        unsigned char *b = skb_tail_pointer(skb);
 
         nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);
         tcm = NLMSG_DATA(nlh);
@@ -340,12 +341,12 @@ tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, unsigned long fh,
                 if (tp->ops->dump && tp->ops->dump(tp, fh, skb, tcm) < 0)
                         goto rtattr_failure;
         }
-        nlh->nlmsg_len = skb->tail - b;
+        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
         return skb->len;
 
 nlmsg_failure:
 rtattr_failure:
-        skb_trim(skb, b - skb->data);
+        nlmsg_trim(skb, b);
         return -1;
 }
 
@@ -399,7 +400,6 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
         if ((dev = dev_get_by_index(tcm->tcm_ifindex)) == NULL)
                 return skb->len;
 
-        read_lock(&qdisc_tree_lock);
         if (!tcm->tcm_parent)
                 q = dev->qdisc_sleeping;
         else
@@ -456,7 +456,6 @@ errout:
         if (cl)
                 cops->put(q, cl);
 out:
-        read_unlock(&qdisc_tree_lock);
         dev_put(dev);
         return skb->len;
 }
@@ -563,30 +562,30 @@ tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
                  * to work with both old and new modes of entering
                  * tc data even if iproute2  was newer - jhs
                  */
-                struct rtattr * p_rta = (struct rtattr*) skb->tail;
+                struct rtattr *p_rta = (struct rtattr *)skb_tail_pointer(skb);
 
                 if (exts->action->type != TCA_OLD_COMPAT) {
                         RTA_PUT(skb, map->action, 0, NULL);
                         if (tcf_action_dump(skb, exts->action, 0, 0) < 0)
                                 goto rtattr_failure;
-                        p_rta->rta_len = skb->tail - (u8*)p_rta;
+                        p_rta->rta_len = skb_tail_pointer(skb) - (u8 *)p_rta;
                 } else if (map->police) {
                         RTA_PUT(skb, map->police, 0, NULL);
                         if (tcf_action_dump_old(skb, exts->action, 0, 0) < 0)
                                 goto rtattr_failure;
-                        p_rta->rta_len = skb->tail - (u8*)p_rta;
+                        p_rta->rta_len = skb_tail_pointer(skb) - (u8 *)p_rta;
                 }
         }
 #elif defined CONFIG_NET_CLS_POLICE
         if (map->police && exts->police) {
-                struct rtattr * p_rta = (struct rtattr*) skb->tail;
+                struct rtattr *p_rta = (struct rtattr *)skb_tail_pointer(skb);
 
                 RTA_PUT(skb, map->police, 0, NULL);
 
                 if (tcf_police_dump(skb, exts->police) < 0)
                         goto rtattr_failure;
 
-                p_rta->rta_len = skb->tail - (u8*)p_rta;
+                p_rta->rta_len = skb_tail_pointer(skb) - (u8 *)p_rta;
         }
 #endif
         return 0;
@@ -614,18 +613,11 @@ rtattr_failure: __attribute__ ((unused))
 
 static int __init tc_filter_init(void)
 {
-        struct rtnetlink_link *link_p = rtnetlink_links[PF_UNSPEC];
+        rtnl_register(PF_UNSPEC, RTM_NEWTFILTER, tc_ctl_tfilter, NULL);
+        rtnl_register(PF_UNSPEC, RTM_DELTFILTER, tc_ctl_tfilter, NULL);
+        rtnl_register(PF_UNSPEC, RTM_GETTFILTER, tc_ctl_tfilter,
+                                                 tc_dump_tfilter);
 
-        /* Setup rtnetlink links. It is made here to avoid
-           exporting large number of public symbols.
-         */
-
-        if (link_p) {
-                link_p[RTM_NEWTFILTER-RTM_BASE].doit = tc_ctl_tfilter;
-                link_p[RTM_DELTFILTER-RTM_BASE].doit = tc_ctl_tfilter;
-                link_p[RTM_GETTFILTER-RTM_BASE].doit = tc_ctl_tfilter;
-                link_p[RTM_GETTFILTER-RTM_BASE].dumpit = tc_dump_tfilter;
-        }
         return 0;
 }