Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:
 "Highlights (1721 non-merge commits, this has to be a record of some
  sort):

   1) Add 'random' mode to team driver, from Jiri Pirko and Eric
      Dumazet.

   2) Make it so that any driver that supports configuration of multiple
      MAC addresses can provide the forwarding database add and del
      calls by providing a default implementation and hooking that up if
      the driver doesn't have an explicit set of handlers.  From Vlad
      Yasevich.

   3) Support GSO segmentation over tunnels and other encapsulating
      devices such as VXLAN, from Pravin B Shelar.

   4) Support L2 GRE tunnels in the flow dissector, from Michael Dalton.

   5) Implement Tail Loss Probe (TLP) detection in TCP, from Nandita
      Dukkipati.

   6) In the PHY layer, allow supporting wake-on-lan in situations where
      the PHY registers have to be written for it to be configured.

      Use it to support wake-on-lan in mv643xx_eth.

      From Michael Stapelberg.

   7) Significantly improve firewire IPV6 support, from YOSHIFUJI
      Hideaki.

   8) Allow multiple packets to be sent in a single transmission using
      network coding in batman-adv, from Martin Hundebøll.

   9) Add support for T5 cxgb4 chips, from Santosh Rastapur.

  10) Generalize the VXLAN forwarding tables so that there is more
      flexibility in configurating various aspects of the endpoints.
      From David Stevens.

  11) Support RSS and TSO in hardware over GRE tunnels in bxn2x driver,
      from Dmitry Kravkov.

  12) Zero copy support in nfnelink_queue, from Eric Dumazet and Pablo
      Neira Ayuso.

  13) Start adding networking selftests.

  14) In situations of overload on the same AF_PACKET fanout socket, or
      per-cpu packet receive queue, minimize drop by distributing the
      load to other cpus/fanouts.  From Willem de Bruijn and Eric
      Dumazet.

  15) Add support for new payload offset BPF instruction, from Daniel
      Borkmann.

  16) Convert several drivers over to mdoule_platform_driver(), from
      Sachin Kamat.

  17) Provide a minimal BPF JIT image disassembler userspace tool, from
      Daniel Borkmann.

  18) Rewrite F-RTO implementation in TCP to match the final
      specification of it in RFC4138 and RFC5682.  From Yuchung Cheng.

  19) Provide netlink socket diag of netlink sockets ("Yo dawg, I hear
      you like netlink, so I implemented netlink dumping of netlink
      sockets.") From Andrey Vagin.

  20) Remove ugly passing of rtnetlink attributes into rtnl_doit
      functions, from Thomas Graf.

  21) Allow userspace to be able to see if a configuration change occurs
      in the middle of an address or device list dump, from Nicolas
      Dichtel.

  22) Support RFC3168 ECN protection for ipv6 fragments, from Hannes
      Frederic Sowa.

  23) Increase accuracy of packet length used by packet scheduler, from
      Jason Wang.

  24) Beginning set of changes to make ipv4/ipv6 fragment handling more
      scalable and less susceptible to overload and locking contention,
      from Jesper Dangaard Brouer.

  25) Get rid of using non-type-safe NLMSG_* macros and use nlmsg_*()
      instead.  From Hong Zhiguo.

  26) Optimize route usage in IPVS by avoiding reference counting where
      possible, from Julian Anastasov.

  27) Convert IPVS schedulers to RCU, also from Julian Anastasov.

  28) Support cpu fanouts in xt_NFQUEUE netfilter target, from Holger
      Eitzenberger.

  29) Network namespace support for nf_log, ebt_log, xt_LOG, ipt_ULOG,
      nfnetlink_log, and nfnetlink_queue.  From Gao feng.

  30) Implement RFC3168 ECN protection, from Hannes Frederic Sowa.

  31) Support several new r8169 chips, from Hayes Wang.

  32) Support tokenized interface identifiers in ipv6, from Daniel
      Borkmann.

  33) Use usbnet_link_change() helper in USB net driver, from Ming Lei.

  34) Add 802.1ad vlan offload support, from Patrick McHardy.

  35) Support mmap() based netlink communication, also from Patrick
      McHardy.

  36) Support HW timestamping in mlx4 driver, from Amir Vadai.

  37) Rationalize AF_PACKET packet timestamping when transmitting, from
      Willem de Bruijn and Daniel Borkmann.

  38) Bring parity to what's provided by /proc/net/packet socket dumping
      and the info provided by netlink socket dumping of AF_PACKET
      sockets.  From Nicolas Dichtel.

  39) Fix peeking beyond zero sized SKBs in AF_UNIX, from Benjamin
      Poirier"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
  filter: fix va_list build error
  af_unix: fix a fatal race with bit fields
  bnx2x: Prevent memory leak when cnic is absent
  bnx2x: correct reading of speed capabilities
  net: sctp: attribute printl with __printf for gcc fmt checks
  netlink: kconfig: move mmap i/o into netlink kconfig
  netpoll: convert mutex into a semaphore
  netlink: Fix skb ref counting.
  net_sched: act_ipt forward compat with xtables
  mlx4_en: fix a build error on 32bit arches
  Revert "bnx2x: allow nvram test to run when device is down"
  bridge: avoid OOPS if root port not found
  drivers: net: cpsw: fix kernel warn on cpsw irq enable
  sh_eth: use random MAC address if no valid one supplied
  3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)
  tg3: fix to append hardware time stamping flags
  unix/stream: fix peeking with an offset larger than data in queue
  unix/dgram: fix peeking with an offset larger than data in queue
  unix/dgram: peek beyond 0-sized skbs
  openvswitch: Remove unneeded ovs_netdev_get_ifindex()
  ...

8 files changed, 106 insertions, 61 deletions

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 8579c4bb20c9..fd7072827a40 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -982,7 +982,7 @@ done:
         return ret;
 }
 
-static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
+static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n)
 {
         struct net *net = sock_net(skb->sk);
         struct nlattr *tca[TCA_ACT_MAX + 1];
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 08fa1e8a4ca4..3a4c0caa1f7d 100644
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -166,15 +166,17 @@ static int tcf_csum_ipv4_igmp(struct sk_buff *skb,
         return 1;
 }
 
-static int tcf_csum_ipv6_icmp(struct sk_buff *skb, struct ipv6hdr *ip6h,
+static int tcf_csum_ipv6_icmp(struct sk_buff *skb,
                               unsigned int ihl, unsigned int ipl)
 {
         struct icmp6hdr *icmp6h;
+        const struct ipv6hdr *ip6h;
 
         icmp6h = tcf_csum_skb_nextlayer(skb, ihl, ipl, sizeof(*icmp6h));
         if (icmp6h == NULL)
                 return 0;
 
+        ip6h = ipv6_hdr(skb);
         icmp6h->icmp6_cksum = 0;
         skb->csum = csum_partial(icmp6h, ipl - ihl, 0);
         icmp6h->icmp6_cksum = csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
@@ -186,15 +188,17 @@ static int tcf_csum_ipv6_icmp(struct sk_buff *skb, struct ipv6hdr *ip6h,
         return 1;
 }
 
-static int tcf_csum_ipv4_tcp(struct sk_buff *skb, struct iphdr *iph,
+static int tcf_csum_ipv4_tcp(struct sk_buff *skb,
                              unsigned int ihl, unsigned int ipl)
 {
         struct tcphdr *tcph;
+        const struct iphdr *iph;
 
         tcph = tcf_csum_skb_nextlayer(skb, ihl, ipl, sizeof(*tcph));
         if (tcph == NULL)
                 return 0;
 
+        iph = ip_hdr(skb);
         tcph->check = 0;
         skb->csum = csum_partial(tcph, ipl - ihl, 0);
         tcph->check = tcp_v4_check(ipl - ihl,
@@ -205,15 +209,17 @@ static int tcf_csum_ipv4_tcp(struct sk_buff *skb, struct iphdr *iph,
         return 1;
 }
 
-static int tcf_csum_ipv6_tcp(struct sk_buff *skb, struct ipv6hdr *ip6h,
+static int tcf_csum_ipv6_tcp(struct sk_buff *skb,
                              unsigned int ihl, unsigned int ipl)
 {
         struct tcphdr *tcph;
+        const struct ipv6hdr *ip6h;
 
         tcph = tcf_csum_skb_nextlayer(skb, ihl, ipl, sizeof(*tcph));
         if (tcph == NULL)
                 return 0;
 
+        ip6h = ipv6_hdr(skb);
         tcph->check = 0;
         skb->csum = csum_partial(tcph, ipl - ihl, 0);
         tcph->check = csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
@@ -225,10 +231,11 @@ static int tcf_csum_ipv6_tcp(struct sk_buff *skb, struct ipv6hdr *ip6h,
         return 1;
 }
 
-static int tcf_csum_ipv4_udp(struct sk_buff *skb, struct iphdr *iph,
+static int tcf_csum_ipv4_udp(struct sk_buff *skb,
                              unsigned int ihl, unsigned int ipl, int udplite)
 {
         struct udphdr *udph;
+        const struct iphdr *iph;
         u16 ul;
 
         /*
@@ -242,6 +249,7 @@ static int tcf_csum_ipv4_udp(struct sk_buff *skb, struct iphdr *iph,
         if (udph == NULL)
                 return 0;
 
+        iph = ip_hdr(skb);
         ul = ntohs(udph->len);
 
         if (udplite || udph->check) {
@@ -276,10 +284,11 @@ ignore_obscure_skb:
         return 1;
 }
 
-static int tcf_csum_ipv6_udp(struct sk_buff *skb, struct ipv6hdr *ip6h,
+static int tcf_csum_ipv6_udp(struct sk_buff *skb,
                              unsigned int ihl, unsigned int ipl, int udplite)
 {
         struct udphdr *udph;
+        const struct ipv6hdr *ip6h;
         u16 ul;
 
         /*
@@ -293,6 +302,7 @@ static int tcf_csum_ipv6_udp(struct sk_buff *skb, struct ipv6hdr *ip6h,
         if (udph == NULL)
                 return 0;
 
+        ip6h = ipv6_hdr(skb);
         ul = ntohs(udph->len);
 
         udph->check = 0;
@@ -328,7 +338,7 @@ ignore_obscure_skb:
 
 static int tcf_csum_ipv4(struct sk_buff *skb, u32 update_flags)
 {
-        struct iphdr *iph;
+        const struct iphdr *iph;
         int ntkoff;
 
         ntkoff = skb_network_offset(skb);
@@ -353,19 +363,19 @@ static int tcf_csum_ipv4(struct sk_buff *skb, u32 update_flags)
                 break;
         case IPPROTO_TCP:
                 if (update_flags & TCA_CSUM_UPDATE_FLAG_TCP)
-                        if (!tcf_csum_ipv4_tcp(skb, iph, iph->ihl * 4,
+                        if (!tcf_csum_ipv4_tcp(skb, iph->ihl * 4,
                                                ntohs(iph->tot_len)))
                                 goto fail;
                 break;
         case IPPROTO_UDP:
                 if (update_flags & TCA_CSUM_UPDATE_FLAG_UDP)
-                        if (!tcf_csum_ipv4_udp(skb, iph, iph->ihl * 4,
+                        if (!tcf_csum_ipv4_udp(skb, iph->ihl * 4,
                                                ntohs(iph->tot_len), 0))
                                 goto fail;
                 break;
         case IPPROTO_UDPLITE:
                 if (update_flags & TCA_CSUM_UPDATE_FLAG_UDPLITE)
-                        if (!tcf_csum_ipv4_udp(skb, iph, iph->ihl * 4,
+                        if (!tcf_csum_ipv4_udp(skb, iph->ihl * 4,
                                                ntohs(iph->tot_len), 1))
                                 goto fail;
                 break;
@@ -377,7 +387,7 @@ static int tcf_csum_ipv4(struct sk_buff *skb, u32 update_flags)
                     pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
                         goto fail;
 
-                ip_send_check(iph);
+                ip_send_check(ip_hdr(skb));
         }
 
         return 1;
@@ -456,6 +466,7 @@ static int tcf_csum_ipv6(struct sk_buff *skb, u32 update_flags)
                         ixhl = ipv6_optlen(ip6xh);
                         if (!pskb_may_pull(skb, hl + ixhl + ntkoff))
                                 goto fail;
+                        ip6xh = (void *)(skb_network_header(skb) + hl);
                         if ((nexthdr == NEXTHDR_HOP) &&
                             !(tcf_csum_ipv6_hopopts(ip6xh, ixhl, &pl)))
                                 goto fail;
@@ -464,25 +475,25 @@ static int tcf_csum_ipv6(struct sk_buff *skb, u32 update_flags)
                         break;
                 case IPPROTO_ICMPV6:
                         if (update_flags & TCA_CSUM_UPDATE_FLAG_ICMP)
-                                if (!tcf_csum_ipv6_icmp(skb, ip6h,
+                                if (!tcf_csum_ipv6_icmp(skb,
                                                         hl, pl + sizeof(*ip6h)))
                                         goto fail;
                         goto done;
                 case IPPROTO_TCP:
                         if (update_flags & TCA_CSUM_UPDATE_FLAG_TCP)
-                                if (!tcf_csum_ipv6_tcp(skb, ip6h,
+                                if (!tcf_csum_ipv6_tcp(skb,
                                                        hl, pl + sizeof(*ip6h)))
                                         goto fail;
                         goto done;
                 case IPPROTO_UDP:
                         if (update_flags & TCA_CSUM_UPDATE_FLAG_UDP)
-                                if (!tcf_csum_ipv6_udp(skb, ip6h, hl,
+                                if (!tcf_csum_ipv6_udp(skb, hl,
                                                        pl + sizeof(*ip6h), 0))
                                         goto fail;
                         goto done;
                 case IPPROTO_UDPLITE:
                         if (update_flags & TCA_CSUM_UPDATE_FLAG_UDPLITE)
-                                if (!tcf_csum_ipv6_udp(skb, ip6h, hl,
+                                if (!tcf_csum_ipv6_udp(skb, hl,
                                                        pl + sizeof(*ip6h), 1))
                                         goto fail;
                         goto done;
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index e0f6de64afec..60d88b6b9560 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -8,7 +8,7 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  *
- * Copyright:   Jamal Hadi Salim (2002-4)
+ * Copyright:   Jamal Hadi Salim (2002-13)
  */
 
 #include <linux/types.h>
@@ -303,17 +303,44 @@ static struct tc_action_ops act_ipt_ops = {
         .walk           =       tcf_generic_walker
 };
 
-MODULE_AUTHOR("Jamal Hadi Salim(2002-4)");
+static struct tc_action_ops act_xt_ops = {
+        .kind           =       "xt",
+        .hinfo          =       &ipt_hash_info,
+        .type           =       TCA_ACT_IPT,
+        .capab          =       TCA_CAP_NONE,
+        .owner          =       THIS_MODULE,
+        .act            =       tcf_ipt,
+        .dump           =       tcf_ipt_dump,
+        .cleanup        =       tcf_ipt_cleanup,
+        .lookup         =       tcf_hash_search,
+        .init           =       tcf_ipt_init,
+        .walk           =       tcf_generic_walker
+};
+
+MODULE_AUTHOR("Jamal Hadi Salim(2002-13)");
 MODULE_DESCRIPTION("Iptables target actions");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("act_xt");
 
 static int __init ipt_init_module(void)
 {
-        return tcf_register_action(&act_ipt_ops);
+        int ret1, ret2;
+        ret1 = tcf_register_action(&act_xt_ops);
+        if (ret1 < 0)
+                printk("Failed to load xt action\n");
+        ret2 = tcf_register_action(&act_ipt_ops);
+        if (ret2 < 0)
+                printk("Failed to load ipt action\n");
+
+        if (ret1 < 0 && ret2 < 0)
+                return ret1;
+        else
+                return 0;
 }
 
 static void __exit ipt_cleanup_module(void)
 {
+        tcf_unregister_action(&act_xt_ops);
         tcf_unregister_action(&act_ipt_ops);
 }
 
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 964f5e4f4b8a..8e118af90973 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -22,7 +22,6 @@
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/kmod.h>
-#include <linux/netlink.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <net/net_namespace.h>
@@ -118,7 +117,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)
 
 /* Add/change/delete/get a filter node */
 
-static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
+static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n)
 {
         struct net *net = sock_net(skb->sk);
         struct nlattr *tca[TCA_MAX + 1];
@@ -141,7 +140,12 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 
         if ((n->nlmsg_type != RTM_GETTFILTER) && !capable(CAP_NET_ADMIN))
                 return -EPERM;
+
 replay:
+        err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, NULL);
+        if (err < 0)
+                return err;
+
         t = nlmsg_data(n);
         protocol = TC_H_MIN(t->tcm_info);
         prio = TC_H_MAJ(t->tcm_info);
@@ -164,10 +168,6 @@ replay:
         if (dev == NULL)
                 return -ENODEV;
 
-        err = nlmsg_parse(n, sizeof(*t), tca, TCA_MAX, NULL);
-        if (err < 0)
-                return err;
-
         /* Find qdisc */
         if (!parent) {
                 q = dev->qdisc;
@@ -427,7 +427,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
         const struct Qdisc_class_ops *cops;
         struct tcf_dump_args arg;
 
-        if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm)))
+        if (nlmsg_len(cb->nlh) < sizeof(*tcm))
                 return skb->len;
         dev = __dev_get_by_index(net, tcm->tcm_ifindex);
         if (!dev)
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index aa36a8c8b33b..7881e2fccbc2 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -393,7 +393,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
                         return -EOPNOTSUPP;
 
                 if ((keymask & (FLOW_KEY_SKUID|FLOW_KEY_SKGID)) &&
-                    sk_user_ns(NETLINK_CB(in_skb).ssk) != &init_user_ns)
+                    sk_user_ns(NETLINK_CB(in_skb).sk) != &init_user_ns)
                         return -EOPNOTSUPP;
         }
 
diff --git a/net/sched/em_ipset.c b/net/sched/em_ipset.c
index 3130320997e2..938b7cbf5627 100644
--- a/net/sched/em_ipset.c
+++ b/net/sched/em_ipset.c
@@ -83,7 +83,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em,
         opt.dim = set->dim;
         opt.flags = set->flags;
         opt.cmdflags = 0;
-        opt.timeout = ~0u;
+        opt.ext.timeout = ~0u;
 
         network_offset = skb_network_offset(skb);
         skb_pull(skb, network_offset);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index c297e2a8e2a1..2b935e7cfe7b 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -971,13 +971,13 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w)
  * Delete/get qdisc.
  */
 
-static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
+static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n)
 {
         struct net *net = sock_net(skb->sk);
         struct tcmsg *tcm = nlmsg_data(n);
         struct nlattr *tca[TCA_MAX + 1];
         struct net_device *dev;
-        u32 clid = tcm->tcm_parent;
+        u32 clid;
         struct Qdisc *q = NULL;
         struct Qdisc *p = NULL;
         int err;
@@ -985,14 +985,15 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
         if ((n->nlmsg_type != RTM_GETQDISC) && !capable(CAP_NET_ADMIN))
                 return -EPERM;
 
-        dev = __dev_get_by_index(net, tcm->tcm_ifindex);
-        if (!dev)
-                return -ENODEV;
-
         err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
         if (err < 0)
                 return err;
 
+        dev = __dev_get_by_index(net, tcm->tcm_ifindex);
+        if (!dev)
+                return -ENODEV;
+
+        clid = tcm->tcm_parent;
         if (clid) {
                 if (clid != TC_H_ROOT) {
                         if (TC_H_MAJ(clid) != TC_H_MAJ(TC_H_INGRESS)) {
@@ -1038,7 +1039,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
  * Create/change qdisc.
  */
 
-static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
+static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n)
 {
         struct net *net = sock_net(skb->sk);
         struct tcmsg *tcm;
@@ -1053,6 +1054,10 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 
 replay:
         /* Reinit, just in case something touches this. */
+        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
+        if (err < 0)
+                return err;
+
         tcm = nlmsg_data(n);
         clid = tcm->tcm_parent;
         q = p = NULL;
@@ -1061,9 +1066,6 @@ replay:
         if (!dev)
                 return -ENODEV;
 
-        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
-        if (err < 0)
-                return err;
 
         if (clid) {
                 if (clid != TC_H_ROOT) {
@@ -1372,7 +1374,7 @@ done:
 
 
 
-static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
+static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n)
 {
         struct net *net = sock_net(skb->sk);
         struct tcmsg *tcm = nlmsg_data(n);
@@ -1382,22 +1384,22 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
         const struct Qdisc_class_ops *cops;
         unsigned long cl = 0;
         unsigned long new_cl;
-        u32 portid = tcm->tcm_parent;
-        u32 clid = tcm->tcm_handle;
-        u32 qid = TC_H_MAJ(clid);
+        u32 portid;
+        u32 clid;
+        u32 qid;
         int err;
 
         if ((n->nlmsg_type != RTM_GETTCLASS) && !capable(CAP_NET_ADMIN))
                 return -EPERM;
 
-        dev = __dev_get_by_index(net, tcm->tcm_ifindex);
-        if (!dev)
-                return -ENODEV;
-
         err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
         if (err < 0)
                 return err;
 
+        dev = __dev_get_by_index(net, tcm->tcm_ifindex);
+        if (!dev)
+                return -ENODEV;
+
         /*
            parent == TC_H_UNSPEC - unspecified parent.
            parent == TC_H_ROOT   - class is root, which has no parent.
@@ -1413,6 +1415,10 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 
         /* Step 1. Determine qdisc handle X:0 */
 
+        portid = tcm->tcm_parent;
+        clid = tcm->tcm_handle;
+        qid = TC_H_MAJ(clid);
+
         if (portid != TC_H_ROOT) {
                 u32 qid1 = TC_H_MAJ(portid);
 
@@ -1636,7 +1642,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)
         struct net_device *dev;
         int t, s_t;
 
-        if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm)))
+        if (nlmsg_len(cb->nlh) < sizeof(*tcm))
                 return 0;
         dev = dev_get_by_index(net, tcm->tcm_ifindex);
         if (!dev)
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 571f1d211f4d..79b1876b6cd2 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -981,6 +981,7 @@ static const struct nla_policy htb_policy[TCA_HTB_MAX + 1] = {
         [TCA_HTB_INIT]  = { .len = sizeof(struct tc_htb_glob) },
         [TCA_HTB_CTAB]  = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
         [TCA_HTB_RTAB]  = { .type = NLA_BINARY, .len = TC_RTAB_SIZE },
+        [TCA_HTB_DIRECT_QLEN] = { .type = NLA_U32 },
 };
 
 static void htb_work_func(struct work_struct *work)
@@ -994,7 +995,7 @@ static void htb_work_func(struct work_struct *work)
 static int htb_init(struct Qdisc *sch, struct nlattr *opt)
 {
         struct htb_sched *q = qdisc_priv(sch);
-        struct nlattr *tb[TCA_HTB_INIT + 1];
+        struct nlattr *tb[TCA_HTB_MAX + 1];
         struct tc_htb_glob *gopt;
         int err;
         int i;
@@ -1002,20 +1003,16 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt)
         if (!opt)
                 return -EINVAL;
 
-        err = nla_parse_nested(tb, TCA_HTB_INIT, opt, htb_policy);
+        err = nla_parse_nested(tb, TCA_HTB_MAX, opt, htb_policy);
         if (err < 0)
                 return err;
 
-        if (tb[TCA_HTB_INIT] == NULL) {
-                pr_err("HTB: hey probably you have bad tc tool ?\n");
+        if (!tb[TCA_HTB_INIT])
                 return -EINVAL;
-        }
+
         gopt = nla_data(tb[TCA_HTB_INIT]);
-        if (gopt->version != HTB_VER >> 16) {
-                pr_err("HTB: need tc/htb version %d (minor is %d), you have %d\n",
-                       HTB_VER >> 16, HTB_VER & 0xffff, gopt->version);
+        if (gopt->version != HTB_VER >> 16)
                 return -EINVAL;
-        }
 
         err = qdisc_class_hash_init(&q->clhash);
         if (err < 0)
@@ -1027,10 +1024,13 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt)
         INIT_WORK(&q->work, htb_work_func);
         skb_queue_head_init(&q->direct_queue);
 
-        q->direct_qlen = qdisc_dev(sch)->tx_queue_len;
-        if (q->direct_qlen < 2) /* some devices have zero tx_queue_len */
-                q->direct_qlen = 2;
-
+        if (tb[TCA_HTB_DIRECT_QLEN])
+                q->direct_qlen = nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]);
+        else {
+                q->direct_qlen = qdisc_dev(sch)->tx_queue_len;
+                if (q->direct_qlen < 2) /* some devices have zero tx_queue_len */
+                        q->direct_qlen = 2;
+        }
         if ((q->rate2quantum = gopt->rate2quantum) < 1)
                 q->rate2quantum = 1;
         q->defcls = gopt->defcls;
@@ -1056,7 +1056,8 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
         nest = nla_nest_start(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
-        if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt))
+        if (nla_put(skb, TCA_HTB_INIT, sizeof(gopt), &gopt) ||
+            nla_put_u32(skb, TCA_HTB_DIRECT_QLEN, q->direct_qlen))
                 goto nla_put_failure;
         nla_nest_end(skb, nest);
 
@@ -1311,7 +1312,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
         struct htb_sched *q = qdisc_priv(sch);
         struct htb_class *cl = (struct htb_class *)*arg, *parent;
         struct nlattr *opt = tca[TCA_OPTIONS];
-        struct nlattr *tb[__TCA_HTB_MAX];
+        struct nlattr *tb[TCA_HTB_MAX + 1];
         struct tc_htb_opt *hopt;
 
         /* extract all subattrs from opt attr */