23 files changed, 306 insertions, 254 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 01993ad74e76..600bb23c4c2e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1939,22 +1939,6 @@ int netif_rx_ni(struct sk_buff *skb)
 
 EXPORT_SYMBOL(netif_rx_ni);
 
-static inline struct net_device *skb_bond(struct sk_buff *skb)
-{
-        struct net_device *dev = skb->dev;
-
-        if (dev->master) {
-                if (skb_bond_should_drop(skb)) {
-                        kfree_skb(skb);
-                        return NULL;
-                }
-                skb->dev = dev->master;
-        }
-
-        return dev;
-}
-
-
 static void net_tx_action(struct softirq_action *h)
 {
         struct softnet_data *sd = &__get_cpu_var(softnet_data);
@@ -2181,6 +2165,7 @@ int netif_receive_skb(struct sk_buff *skb)
 {
         struct packet_type *ptype, *pt_prev;
         struct net_device *orig_dev;
+        struct net_device *null_or_orig;
         int ret = NET_RX_DROP;
         __be16 type;
 
@@ -2194,10 +2179,14 @@ int netif_receive_skb(struct sk_buff *skb)
         if (!skb->iif)
                 skb->iif = skb->dev->ifindex;
 
-        orig_dev = skb_bond(skb);
-
-        if (!orig_dev)
-                return NET_RX_DROP;
+        null_or_orig = NULL;
+        orig_dev = skb->dev;
+        if (orig_dev->master) {
+                if (skb_bond_should_drop(skb))
+                        null_or_orig = orig_dev; /* deliver only exact match */
+                else
+                        skb->dev = orig_dev->master;
+        }
 
         __get_cpu_var(netdev_rx_stat).total++;
 
@@ -2221,7 +2210,8 @@ int netif_receive_skb(struct sk_buff *skb)
 #endif
 
         list_for_each_entry_rcu(ptype, &ptype_all, list) {
-                if (!ptype->dev || ptype->dev == skb->dev) {
+                if (ptype->dev == null_or_orig || ptype->dev == skb->dev ||
+                    ptype->dev == orig_dev) {
                         if (pt_prev)
                                 ret = deliver_skb(skb, pt_prev, orig_dev);
                         pt_prev = ptype;
@@ -2246,7 +2236,8 @@ ncls:
         list_for_each_entry_rcu(ptype,
                         &ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
                 if (ptype->type == type &&
-                    (!ptype->dev || ptype->dev == skb->dev)) {
+                    (ptype->dev == null_or_orig || ptype->dev == skb->dev ||
+                     ptype->dev == orig_dev)) {
                         if (pt_prev)
                                 ret = deliver_skb(skb, pt_prev, orig_dev);
                         pt_prev = ptype;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 2498cdaf8cbe..526236453908 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -168,7 +168,7 @@
 #include <asm/div64.h>          /* do_div */
 #include <asm/timex.h>
 
-#define VERSION  "pktgen v2.69: Packet Generator for packet performance testing.\n"
+#define VERSION  "pktgen v2.70: Packet Generator for packet performance testing.\n"
 
 #define IP_NAME_SZ 32
 #define MAX_MPLS_LABELS 16 /* This is the max label stack depth */
@@ -189,6 +189,7 @@
 #define F_FLOW_SEQ    (1<<11)   /* Sequential flows */
 #define F_IPSEC_ON    (1<<12)   /* ipsec on for flows */
 #define F_QUEUE_MAP_RND (1<<13) /* queue map Random */
+#define F_QUEUE_MAP_CPU (1<<14) /* queue map mirrors smp_processor_id() */
 
 /* Thread control flag bits */
 #define T_TERMINATE   (1<<0)
@@ -621,6 +622,9 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
         if (pkt_dev->flags & F_QUEUE_MAP_RND)
                 seq_printf(seq,  "QUEUE_MAP_RND  ");
 
+        if (pkt_dev->flags & F_QUEUE_MAP_CPU)
+                seq_printf(seq,  "QUEUE_MAP_CPU  ");
+
         if (pkt_dev->cflows) {
                 if (pkt_dev->flags & F_FLOW_SEQ)
                         seq_printf(seq,  "FLOW_SEQ  "); /*in sequence flows*/
@@ -1134,6 +1138,12 @@ static ssize_t pktgen_if_write(struct file *file,
 
                 else if (strcmp(f, "!QUEUE_MAP_RND") == 0)
                         pkt_dev->flags &= ~F_QUEUE_MAP_RND;
+
+                else if (strcmp(f, "QUEUE_MAP_CPU") == 0)
+                        pkt_dev->flags |= F_QUEUE_MAP_CPU;
+
+                else if (strcmp(f, "!QUEUE_MAP_CPU") == 0)
+                        pkt_dev->flags &= ~F_QUEUE_MAP_CPU;
 #ifdef CONFIG_XFRM
                 else if (strcmp(f, "IPSEC") == 0)
                         pkt_dev->flags |= F_IPSEC_ON;
@@ -1895,6 +1905,23 @@ static int pktgen_device_event(struct notifier_block *unused,
         return NOTIFY_DONE;
 }
 
+static struct net_device *pktgen_dev_get_by_name(struct pktgen_dev *pkt_dev, const char *ifname)
+{
+        char b[IFNAMSIZ+5];
+        int i = 0;
+
+        for(i=0; ifname[i] != '@'; i++) {
+                if(i == IFNAMSIZ)
+                        break;
+
+                b[i] = ifname[i];
+        }
+        b[i] = 0;
+
+        return dev_get_by_name(&init_net, b);
+}
+
+
 /* Associate pktgen_dev with a device. */
 
 static int pktgen_setup_dev(struct pktgen_dev *pkt_dev, const char *ifname)
@@ -1908,7 +1935,7 @@ static int pktgen_setup_dev(struct pktgen_dev *pkt_dev, const char *ifname)
                 pkt_dev->odev = NULL;
         }
 
-        odev = dev_get_by_name(&init_net, ifname);
+        odev = pktgen_dev_get_by_name(pkt_dev, ifname);
         if (!odev) {
                 printk(KERN_ERR "pktgen: no such netdevice: \"%s\"\n", ifname);
                 return -ENODEV;
@@ -2129,7 +2156,11 @@ static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow)
 #endif
 static void set_cur_queue_map(struct pktgen_dev *pkt_dev)
 {
-        if (pkt_dev->queue_map_min < pkt_dev->queue_map_max) {
+
+        if (pkt_dev->flags & F_QUEUE_MAP_CPU)
+                pkt_dev->cur_queue_map = smp_processor_id();
+
+        else if (pkt_dev->queue_map_min < pkt_dev->queue_map_max) {
                 __u16 t;
                 if (pkt_dev->flags & F_QUEUE_MAP_RND) {
                         t = random32() %
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 1c2e3ec2eb57..b4bc6e095a0e 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -229,7 +229,8 @@ extern void dccp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb);
 extern int  dccp_retransmit_skb(struct sock *sk);
 
 extern void dccp_send_ack(struct sock *sk);
-extern void dccp_reqsk_send_ack(struct sk_buff *sk, struct request_sock *rsk);
+extern void dccp_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
+                                struct request_sock *rsk);
 
 extern void dccp_send_sync(struct sock *sk, const u64 seq,
                            const enum dccp_pkt_type pkt_type);
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 66dca5bba858..b2804e2d1b8c 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -296,7 +296,8 @@ int dccp_child_process(struct sock *parent, struct sock *child,
 
 EXPORT_SYMBOL_GPL(dccp_child_process);
 
-void dccp_reqsk_send_ack(struct sk_buff *skb, struct request_sock *rsk)
+void dccp_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
+                         struct request_sock *rsk)
 {
         DCCP_BUG("DCCP-ACK packets are never sent in LISTEN/RESPOND state");
 }
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 4e73e5708e70..21515d4c49eb 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -575,7 +575,7 @@ static int esp_init_state(struct xfrm_state *x)
                               crypto_aead_ivsize(aead);
         if (x->props.mode == XFRM_MODE_TUNNEL)
                 x->props.header_len += sizeof(struct iphdr);
-        else if (x->props.mode == XFRM_MODE_BEET)
+        else if (x->props.mode == XFRM_MODE_BEET && x->sel.family != AF_INET6)
                 x->props.header_len += IPV4_BEET_PHMAXLEN;
         if (x->encap) {
                 struct xfrm_encap_tmpl *encap = x->encap;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 1bfa078ddbd0..16fc6f454a31 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1509,14 +1509,14 @@ unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
 
                                         /* BSD 4.2 compatibility hack :-( */
                                         if (mtu == 0 &&
-                                            old_mtu >= dst_metric(&rth->u.dst, RTAX_MTU) &&
+                                            old_mtu >= dst_mtu(&rth->u.dst) &&
                                             old_mtu >= 68 + (iph->ihl << 2))
                                                 old_mtu -= iph->ihl << 2;
 
                                         mtu = guess_mtu(old_mtu);
                                 }
-                                if (mtu <= dst_metric(&rth->u.dst, RTAX_MTU)) {
-                                        if (mtu < dst_metric(&rth->u.dst, RTAX_MTU)) {
+                                if (mtu <= dst_mtu(&rth->u.dst)) {
+                                        if (mtu < dst_mtu(&rth->u.dst)) {
                                                 dst_confirm(&rth->u.dst);
                                                 if (mtu < ip_rt_min_pmtu) {
                                                         mtu = ip_rt_min_pmtu;
@@ -1538,7 +1538,7 @@ unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
 
 static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
-        if (dst_metric(dst, RTAX_MTU) > mtu && mtu >= 68 &&
+        if (dst_mtu(dst) > mtu && mtu >= 68 &&
             !(dst_metric_locked(dst, RTAX_MTU))) {
                 if (mtu < ip_rt_min_pmtu) {
                         mtu = ip_rt_min_pmtu;
@@ -1667,7 +1667,7 @@ static void rt_set_nexthop(struct rtable *rt, struct fib_result *res, u32 itag)
 
         if (dst_metric(&rt->u.dst, RTAX_HOPLIMIT) == 0)
                 rt->u.dst.metrics[RTAX_HOPLIMIT-1] = sysctl_ip_default_ttl;
-        if (dst_metric(&rt->u.dst, RTAX_MTU) > IP_MAX_MTU)
+        if (dst_mtu(&rt->u.dst) > IP_MAX_MTU)
                 rt->u.dst.metrics[RTAX_MTU-1] = IP_MAX_MTU;
         if (dst_metric(&rt->u.dst, RTAX_ADVMSS) == 0)
                 rt->u.dst.metrics[RTAX_ADVMSS-1] = max_t(unsigned int, rt->u.dst.dev->mtu - 40,
@@ -3223,9 +3223,7 @@ int __init ip_rt_init(void)
  */
 void __init ip_static_sysctl_init(void)
 {
-#ifdef CONFIG_SYSCTL
         register_sysctl_paths(ipv4_route_path, ipv4_route_table);
-#endif
 }
 #endif
 
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 91a8cfddf1c4..44c1e934824b 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -687,14 +687,14 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
         inet_twsk_put(tw);
 }
 
-static void tcp_v4_reqsk_send_ack(struct sk_buff *skb,
+static void tcp_v4_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
                                   struct request_sock *req)
 {
         tcp_v4_send_ack(skb, tcp_rsk(req)->snt_isn + 1,
                         tcp_rsk(req)->rcv_isn + 1, req->rcv_wnd,
                         req->ts_recent,
                         0,
-                        tcp_v4_md5_do_lookup(skb->sk, ip_hdr(skb)->daddr));
+                        tcp_v4_md5_do_lookup(sk, ip_hdr(skb)->daddr));
 }
 
 /*
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 204c42162660..f976fc57892c 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -609,7 +609,7 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb,
                                           tcp_rsk(req)->rcv_isn + 1, tcp_rsk(req)->rcv_isn + 1 + req->rcv_wnd)) {
                 /* Out of window: send ACK and drop. */
                 if (!(flg & TCP_FLAG_RST))
-                        req->rsk_ops->send_ack(skb, req);
+                        req->rsk_ops->send_ack(sk, skb, req);
                 if (paws_reject)
                         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED);
                 return NULL;
@@ -618,89 +618,87 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb,
         /* In sequence, PAWS is OK. */
 
         if (tmp_opt.saw_tstamp && !after(TCP_SKB_CB(skb)->seq, tcp_rsk(req)->rcv_isn + 1))
-                        req->ts_recent = tmp_opt.rcv_tsval;
+                req->ts_recent = tmp_opt.rcv_tsval;
 
-                if (TCP_SKB_CB(skb)->seq == tcp_rsk(req)->rcv_isn) {
-                        /* Truncate SYN, it is out of window starting
-                           at tcp_rsk(req)->rcv_isn + 1. */
-                        flg &= ~TCP_FLAG_SYN;
-                }
+        if (TCP_SKB_CB(skb)->seq == tcp_rsk(req)->rcv_isn) {
+                /* Truncate SYN, it is out of window starting
+                   at tcp_rsk(req)->rcv_isn + 1. */
+                flg &= ~TCP_FLAG_SYN;
+        }
 
-                /* RFC793: "second check the RST bit" and
-                 *         "fourth, check the SYN bit"
-                 */
-                if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {
-                        TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
-                        goto embryonic_reset;
-                }
+        /* RFC793: "second check the RST bit" and
+         *         "fourth, check the SYN bit"
+         */
+        if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {
+                TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
+                goto embryonic_reset;
+        }
 
-                /* ACK sequence verified above, just make sure ACK is
-                 * set.  If ACK not set, just silently drop the packet.
-                 */
-                if (!(flg & TCP_FLAG_ACK))
-                        return NULL;
-
-                /* If TCP_DEFER_ACCEPT is set, drop bare ACK. */
-                if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept &&
-                    TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) {
-                        inet_rsk(req)->acked = 1;
-                        return NULL;
-                }
+        /* ACK sequence verified above, just make sure ACK is
+         * set.  If ACK not set, just silently drop the packet.
+         */
+        if (!(flg & TCP_FLAG_ACK))
+                return NULL;
 
-                /* OK, ACK is valid, create big socket and
-                 * feed this segment to it. It will repeat all
-                 * the tests. THIS SEGMENT MUST MOVE SOCKET TO
-                 * ESTABLISHED STATE. If it will be dropped after
-                 * socket is created, wait for troubles.
-                 */
-                child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb,
-                                                                 req, NULL);
-                if (child == NULL)
-                        goto listen_overflow;
+        /* If TCP_DEFER_ACCEPT is set, drop bare ACK. */
+        if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept &&
+            TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) {
+                inet_rsk(req)->acked = 1;
+                return NULL;
+        }
+
+        /* OK, ACK is valid, create big socket and
+         * feed this segment to it. It will repeat all
+         * the tests. THIS SEGMENT MUST MOVE SOCKET TO
+         * ESTABLISHED STATE. If it will be dropped after
+         * socket is created, wait for troubles.
+         */
+        child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL);
+        if (child == NULL)
+                goto listen_overflow;
 #ifdef CONFIG_TCP_MD5SIG
-                else {
-                        /* Copy over the MD5 key from the original socket */
-                        struct tcp_md5sig_key *key;
-                        struct tcp_sock *tp = tcp_sk(sk);
-                        key = tp->af_specific->md5_lookup(sk, child);
-                        if (key != NULL) {
-                                /*
-                                 * We're using one, so create a matching key on the
-                                 * newsk structure. If we fail to get memory then we
-                                 * end up not copying the key across. Shucks.
-                                 */
-                                char *newkey = kmemdup(key->key, key->keylen,
-                                                       GFP_ATOMIC);
-                                if (newkey) {
-                                        if (!tcp_alloc_md5sig_pool())
-                                                BUG();
-                                        tp->af_specific->md5_add(child, child,
-                                                                 newkey,
-                                                                 key->keylen);
-                                }
+        else {
+                /* Copy over the MD5 key from the original socket */
+                struct tcp_md5sig_key *key;
+                struct tcp_sock *tp = tcp_sk(sk);
+                key = tp->af_specific->md5_lookup(sk, child);
+                if (key != NULL) {
+                        /*
+                         * We're using one, so create a matching key on the
+                         * newsk structure. If we fail to get memory then we
+                         * end up not copying the key across. Shucks.
+                         */
+                        char *newkey = kmemdup(key->key, key->keylen,
+                                               GFP_ATOMIC);
+                        if (newkey) {
+                                if (!tcp_alloc_md5sig_pool())
+                                        BUG();
+                                tp->af_specific->md5_add(child, child, newkey,
+                                                         key->keylen);
                         }
                 }
+        }
 #endif
 
-                inet_csk_reqsk_queue_unlink(sk, req, prev);
-                inet_csk_reqsk_queue_removed(sk, req);
+        inet_csk_reqsk_queue_unlink(sk, req, prev);
+        inet_csk_reqsk_queue_removed(sk, req);
 
-                inet_csk_reqsk_queue_add(sk, req, child);
-                return child;
+        inet_csk_reqsk_queue_add(sk, req, child);
+        return child;
 
-        listen_overflow:
-                if (!sysctl_tcp_abort_on_overflow) {
-                        inet_rsk(req)->acked = 1;
-                        return NULL;
-                }
+listen_overflow:
+        if (!sysctl_tcp_abort_on_overflow) {
+                inet_rsk(req)->acked = 1;
+                return NULL;
+        }
 
-        embryonic_reset:
-                NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
-                if (!(flg & TCP_FLAG_RST))
-                        req->rsk_ops->send_reset(sk, skb);
+embryonic_reset:
+        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
+        if (!(flg & TCP_FLAG_RST))
+                req->rsk_ops->send_reset(sk, skb);
 
-                inet_csk_reqsk_queue_drop(sk, req, prev);
-                return NULL;
+        inet_csk_reqsk_queue_drop(sk, req, prev);
+        return NULL;
 }
 
 /*
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c
index 9c798abce736..63418185f524 100644
--- a/net/ipv4/xfrm4_mode_beet.c
+++ b/net/ipv4/xfrm4_mode_beet.c
@@ -47,8 +47,10 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
         if (unlikely(optlen))
                 hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4);
 
-        skb_set_network_header(skb, IPV4_BEET_PHMAXLEN - x->props.header_len -
-                                    hdrlen);
+        skb_set_network_header(skb, -x->props.header_len -
+                                    hdrlen + (XFRM_MODE_SKB_CB(skb)->ihl - sizeof(*top_iph)));
+        if (x->sel.family != AF_INET6)
+                skb->network_header += IPV4_BEET_PHMAXLEN;
         skb->mac_header = skb->network_header +
                           offsetof(struct iphdr, protocol);
         skb->transport_header = skb->network_header + sizeof(*top_iph);
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index c6bb4c6d24b3..b181b08fb761 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -521,6 +521,10 @@ static int esp6_init_state(struct xfrm_state *x)
                               crypto_aead_ivsize(aead);
         switch (x->props.mode) {
         case XFRM_MODE_BEET:
+                if (x->sel.family != AF_INET6)
+                        x->props.header_len += IPV4_BEET_PHMAXLEN +
+                                               (sizeof(struct ipv6hdr) - sizeof(struct iphdr));
+                break;
         case XFRM_MODE_TRANSPORT:
                 break;
         case XFRM_MODE_TUNNEL:
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 86540b24b27c..5a3e87e4b18f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1249,7 +1249,7 @@ install_route:
 
         if (dst_metric(&rt->u.dst, RTAX_HOPLIMIT) == 0)
                 rt->u.dst.metrics[RTAX_HOPLIMIT-1] = -1;
-        if (!dst_metric(&rt->u.dst, RTAX_MTU))
+        if (!dst_mtu(&rt->u.dst))
                 rt->u.dst.metrics[RTAX_MTU-1] = ipv6_get_mtu(dev);
         if (!dst_metric(&rt->u.dst, RTAX_ADVMSS))
                 rt->u.dst.metrics[RTAX_ADVMSS-1] = ipv6_advmss(net, dst_mtu(&rt->u.dst));
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 78185a409212..5b90b369ccb2 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -69,7 +69,8 @@
 #include <linux/scatterlist.h>
 
 static void     tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
-static void     tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req);
+static void     tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
+                                      struct request_sock *req);
 
 static int      tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb);
 
@@ -1138,10 +1139,11 @@ static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb)
         inet_twsk_put(tw);
 }
 
-static void tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req)
+static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
+                                  struct request_sock *req)
 {
         tcp_v6_send_ack(skb, tcp_rsk(req)->snt_isn + 1, tcp_rsk(req)->rcv_isn + 1, req->rcv_wnd, req->ts_recent,
-                        tcp_v6_md5_do_lookup(skb->sk, &ipv6_hdr(skb)->daddr));
+                        tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr));
 }
 
 
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index d6ce400f585f..bbd48b101bae 100644
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -40,16 +40,39 @@ static void xfrm6_beet_make_header(struct sk_buff *skb)
 static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
 {
         struct ipv6hdr *top_iph;
-
-        skb_set_network_header(skb, -x->props.header_len);
+        struct ip_beet_phdr *ph;
+        struct iphdr *iphv4;
+        int optlen, hdr_len;
+
+        iphv4 = ip_hdr(skb);
+        hdr_len = 0;
+        optlen = XFRM_MODE_SKB_CB(skb)->optlen;
+        if (unlikely(optlen))
+                hdr_len += IPV4_BEET_PHMAXLEN - (optlen & 4);
+
+        skb_set_network_header(skb, -x->props.header_len - hdr_len);
+        if (x->sel.family != AF_INET6)
+                skb->network_header += IPV4_BEET_PHMAXLEN;
         skb->mac_header = skb->network_header +
                           offsetof(struct ipv6hdr, nexthdr);
         skb->transport_header = skb->network_header + sizeof(*top_iph);
-        __skb_pull(skb, XFRM_MODE_SKB_CB(skb)->ihl);
+        ph = (struct ip_beet_phdr *)__skb_pull(skb, XFRM_MODE_SKB_CB(skb)->ihl-hdr_len);
 
         xfrm6_beet_make_header(skb);
 
         top_iph = ipv6_hdr(skb);
+        if (unlikely(optlen)) {
+
+                BUG_ON(optlen < 0);
+
+                ph->padlen = 4 - (optlen & 4);
+                ph->hdrlen = optlen / 8;
+                ph->nexthdr = top_iph->nexthdr;
+                if (ph->padlen)
+                        memset(ph + 1, IPOPT_NOP, ph->padlen);
+
+                top_iph->nexthdr = IPPROTO_BEETPH;
+        }
 
         ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);
         ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 0c02c471bca2..aa5a191598c9 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -245,10 +245,13 @@ static int ieee80211_open(struct net_device *dev)
         case IEEE80211_IF_TYPE_AP:
                 sdata->bss = &sdata->u.ap;
                 break;
+        case IEEE80211_IF_TYPE_MESH_POINT:
+                /* mesh ifaces must set allmulti to forward mcast traffic */
+                atomic_inc(&local->iff_allmultis);
+                break;
         case IEEE80211_IF_TYPE_STA:
         case IEEE80211_IF_TYPE_MNTR:
         case IEEE80211_IF_TYPE_IBSS:
-        case IEEE80211_IF_TYPE_MESH_POINT:
                 /* no special treatment */
                 break;
         case IEEE80211_IF_TYPE_INVALID:
@@ -495,6 +498,9 @@ static int ieee80211_stop(struct net_device *dev)
                 netif_addr_unlock_bh(local->mdev);
                 break;
         case IEEE80211_IF_TYPE_MESH_POINT:
+                /* allmulti is always set on mesh ifaces */
+                atomic_dec(&local->iff_allmultis);
+                /* fall through */
         case IEEE80211_IF_TYPE_STA:
         case IEEE80211_IF_TYPE_IBSS:
                 sdata->u.sta.state = IEEE80211_DISABLED;
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 669eafafe497..7495fbb0d211 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -214,8 +214,7 @@ void ieee80211s_stop(void);
 void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);
 
 /* Mesh paths */
-int mesh_nexthop_lookup(u8 *next_hop, struct sk_buff *skb,
-                struct net_device *dev);
+int mesh_nexthop_lookup(struct sk_buff *skb, struct net_device *dev);
 void mesh_path_start_discovery(struct net_device *dev);
 struct mesh_path *mesh_path_lookup(u8 *dst, struct net_device *dev);
 struct mesh_path *mesh_path_lookup_by_idx(int idx, struct net_device *dev);
@@ -286,6 +285,4 @@ static inline void mesh_path_activate(struct mesh_path *mpath)
 #define mesh_allocated  0
 #endif
 
-#define MESH_PREQ(skb)  (skb->cb + 30)
-
 #endif /* IEEE80211S_H */
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 7fa149e230e6..08aca446ca01 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -758,29 +758,30 @@ enddiscovery:
 /**
  * ieee80211s_lookup_nexthop - put the appropriate next hop on a mesh frame
  *
- * @next_hop: output argument for next hop address
- * @skb: frame to be sent
+ * @skb: 802.11 frame to be sent
  * @dev: network device the frame will be sent through
+ * @fwd_frame: true if this frame was originally from a different host
  *
  * Returns: 0 if the next hop was found. Nonzero otherwise. If no next hop is
  * found, the function will start a path discovery and queue the frame so it is
  * sent when the path is resolved. This means the caller must not free the skb
  * in this case.
  */
-int mesh_nexthop_lookup(u8 *next_hop, struct sk_buff *skb,
-                struct net_device *dev)
+int mesh_nexthop_lookup(struct sk_buff *skb, struct net_device *dev)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct sk_buff *skb_to_free = NULL;
         struct mesh_path *mpath;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        u8 *dst_addr = hdr->addr3;
         int err = 0;
 
         rcu_read_lock();
-        mpath = mesh_path_lookup(skb->data, dev);
+        mpath = mesh_path_lookup(dst_addr, dev);
 
         if (!mpath) {
-                mesh_path_add(skb->data, dev);
-                mpath = mesh_path_lookup(skb->data, dev);
+                mesh_path_add(dst_addr, dev);
+                mpath = mesh_path_lookup(dst_addr, dev);
                 if (!mpath) {
                         dev_kfree_skb(skb);
                         sdata->u.sta.mshstats.dropped_frames_no_route++;
@@ -792,13 +793,13 @@ int mesh_nexthop_lookup(u8 *next_hop, struct sk_buff *skb,
         if (mpath->flags & MESH_PATH_ACTIVE) {
                 if (time_after(jiffies, mpath->exp_time -
                         msecs_to_jiffies(sdata->u.sta.mshcfg.path_refresh_time))
-                                && skb->pkt_type != PACKET_OTHERHOST
+                                && !memcmp(dev->dev_addr, hdr->addr4, ETH_ALEN)
                                 && !(mpath->flags & MESH_PATH_RESOLVING)
                                 && !(mpath->flags & MESH_PATH_FIXED)) {
                         mesh_queue_preq(mpath,
                                         PREQ_Q_F_START | PREQ_Q_F_REFRESH);
                 }
-                memcpy(next_hop, mpath->next_hop->addr,
+                memcpy(hdr->addr1, mpath->next_hop->addr,
                                 ETH_ALEN);
         } else {
                 if (!(mpath->flags & MESH_PATH_RESOLVING)) {
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 5f88a2e6ee50..838ee60492ad 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -388,18 +388,15 @@ void mesh_path_tx_pending(struct mesh_path *mpath)
 void mesh_path_discard_frame(struct sk_buff *skb, struct net_device *dev)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct mesh_path *mpath;
         u32 dsn = 0;
 
-        if (skb->pkt_type == PACKET_OTHERHOST) {
-                struct ieee80211s_hdr *prev_meshhdr;
-                int mshhdrlen;
+        if (memcmp(hdr->addr4, dev->dev_addr, ETH_ALEN) != 0) {
                 u8 *ra, *da;
 
-                prev_meshhdr = ((struct ieee80211s_hdr *)skb->cb);
-                mshhdrlen = ieee80211_get_mesh_hdrlen(prev_meshhdr);
-                da = skb->data;
-                ra = MESH_PREQ(skb);
+                da = hdr->addr3;
+                ra = hdr->addr2;
                 mpath = mesh_path_lookup(da, dev);
                 if (mpath)
                         dsn = ++mpath->dsn;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 6d9ae67c27ca..6db854505193 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1109,20 +1109,9 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
 
         hdrlen = ieee80211_get_hdrlen(fc);
 
-        if (ieee80211_vif_is_mesh(&sdata->vif)) {
-                int meshhdrlen = ieee80211_get_mesh_hdrlen(
+        if (ieee80211_vif_is_mesh(&sdata->vif))
+                hdrlen += ieee80211_get_mesh_hdrlen(
                                 (struct ieee80211s_hdr *) (skb->data + hdrlen));
-                /* Copy on cb:
-                 *  - mesh header: to be used for mesh forwarding
-                 * decision. It will also be used as mesh header template at
-                 * tx.c:ieee80211_subif_start_xmit() if interface
-                 * type is mesh and skb->pkt_type == PACKET_OTHERHOST
-                 *  - ta: to be used if a RERR needs to be sent.
-                 */
-                memcpy(skb->cb, skb->data + hdrlen, meshhdrlen);
-                memcpy(MESH_PREQ(skb), hdr->addr2, ETH_ALEN);
-                hdrlen += meshhdrlen;
-        }
 
         /* convert IEEE 802.11 header + possible LLC headers into Ethernet
          * header
@@ -1269,38 +1258,6 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
                 }
         }
 
-        /* Mesh forwarding */
-        if (ieee80211_vif_is_mesh(&sdata->vif)) {
-                u8 *mesh_ttl = &((struct ieee80211s_hdr *)skb->cb)->ttl;
-                (*mesh_ttl)--;
-
-                if (is_multicast_ether_addr(skb->data)) {
-                        if (*mesh_ttl > 0) {
-                                xmit_skb = skb_copy(skb, GFP_ATOMIC);
-                                if (xmit_skb)
-                                        xmit_skb->pkt_type = PACKET_OTHERHOST;
-                                else if (net_ratelimit())
-                                        printk(KERN_DEBUG "%s: failed to clone "
-                                               "multicast frame\n", dev->name);
-                        } else
-                                IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta,
-                                                             dropped_frames_ttl);
-                } else if (skb->pkt_type != PACKET_OTHERHOST &&
-                        compare_ether_addr(dev->dev_addr, skb->data) != 0) {
-                        if (*mesh_ttl == 0) {
-                                IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta,
-                                                             dropped_frames_ttl);
-                                dev_kfree_skb(skb);
-                                skb = NULL;
-                        } else {
-                                xmit_skb = skb;
-                                xmit_skb->pkt_type = PACKET_OTHERHOST;
-                                if (!(dev->flags & IFF_PROMISC))
-                                        skb  = NULL;
-                        }
-                }
-        }
-
         if (skb) {
                 /* deliver to local stack */
                 skb->protocol = eth_type_trans(skb, dev);
@@ -1431,6 +1388,63 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
 }
 
 static ieee80211_rx_result debug_noinline
+ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
+{
+        struct ieee80211_hdr *hdr;
+        struct ieee80211s_hdr *mesh_hdr;
+        unsigned int hdrlen;
+        struct sk_buff *skb = rx->skb, *fwd_skb;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        hdrlen = ieee80211_hdrlen(hdr->frame_control);
+        mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen);
+
+        if (!ieee80211_is_data(hdr->frame_control))
+                return RX_CONTINUE;
+
+        if (!mesh_hdr->ttl)
+                /* illegal frame */
+                return RX_DROP_MONITOR;
+
+        if (compare_ether_addr(rx->dev->dev_addr, hdr->addr3) == 0)
+                return RX_CONTINUE;
+
+        mesh_hdr->ttl--;
+
+        if (rx->flags & IEEE80211_RX_RA_MATCH) {
+                if (!mesh_hdr->ttl)
+                        IEEE80211_IFSTA_MESH_CTR_INC(&rx->sdata->u.sta,
+                                                     dropped_frames_ttl);
+                else {
+                        struct ieee80211_hdr *fwd_hdr;
+                        fwd_skb = skb_copy(skb, GFP_ATOMIC);
+
+                        if (!fwd_skb && net_ratelimit())
+                                printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
+                                                   rx->dev->name);
+
+                        fwd_hdr =  (struct ieee80211_hdr *) fwd_skb->data;
+                        /*
+                         * Save TA to addr1 to send TA a path error if a
+                         * suitable next hop is not found
+                         */
+                        memcpy(fwd_hdr->addr1, fwd_hdr->addr2, ETH_ALEN);
+                        memcpy(fwd_hdr->addr2, rx->dev->dev_addr, ETH_ALEN);
+                        fwd_skb->dev = rx->local->mdev;
+                        fwd_skb->iif = rx->dev->ifindex;
+                        dev_queue_xmit(fwd_skb);
+                }
+        }
+
+        if (is_multicast_ether_addr(hdr->addr3) ||
+            rx->dev->flags & IFF_PROMISC)
+                return RX_CONTINUE;
+        else
+                return RX_DROP_MONITOR;
+}
+
+
+static ieee80211_rx_result debug_noinline
 ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 {
         struct net_device *dev = rx->dev;
@@ -1663,10 +1677,12 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
         rx->sdata = sdata;
         rx->dev = sdata->dev;
 
-#define CALL_RXH(rxh)           \
-        res = rxh(rx);          \
-        if (res != RX_CONTINUE) \
-                goto rxh_done;
+#define CALL_RXH(rxh)                   \
+        do {                            \
+                res = rxh(rx);          \
+                if (res != RX_CONTINUE) \
+                        goto rxh_done;  \
+        } while (0);
 
         CALL_RXH(ieee80211_rx_h_passive_scan)
         CALL_RXH(ieee80211_rx_h_check)
@@ -1678,6 +1694,8 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
         /* must be after MMIC verify so header is counted in MPDU mic */
         CALL_RXH(ieee80211_rx_h_remove_qos_control)
         CALL_RXH(ieee80211_rx_h_amsdu)
+        if (ieee80211_vif_is_mesh(&sdata->vif))
+                CALL_RXH(ieee80211_rx_h_mesh_fwding);
         CALL_RXH(ieee80211_rx_h_data)
         CALL_RXH(ieee80211_rx_h_ctrl)
         CALL_RXH(ieee80211_rx_h_mgmt)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 771ec68b848d..4788f7b91f49 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1301,6 +1301,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
                                 struct net_device *dev)
 {
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct net_device *odev = NULL;
         struct ieee80211_sub_if_data *osdata;
         int headroom;
@@ -1328,6 +1329,20 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
 
         osdata = IEEE80211_DEV_TO_SUB_IF(odev);
 
+        if (ieee80211_vif_is_mesh(&osdata->vif) &&
+            ieee80211_is_data(hdr->frame_control)) {
+                if (ieee80211_is_data(hdr->frame_control)) {
+                        if (is_multicast_ether_addr(hdr->addr3))
+                                memcpy(hdr->addr1, hdr->addr3, ETH_ALEN);
+                        else
+                                if (mesh_nexthop_lookup(skb, odev))
+                                        return  0;
+                        if (memcmp(odev->dev_addr, hdr->addr4, ETH_ALEN) != 0)
+                                IEEE80211_IFSTA_MESH_CTR_INC(&osdata->u.sta,
+                                                             fwded_frames);
+                }
+        }
+
         may_encrypt = !skb->do_not_encrypt;
 
         headroom = osdata->local->tx_headroom;
@@ -1472,30 +1487,17 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
         case IEEE80211_IF_TYPE_MESH_POINT:
                 fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS);
                 /* RA TA DA SA */
-                if (is_multicast_ether_addr(skb->data))
-                        memcpy(hdr.addr1, skb->data, ETH_ALEN);
-                else if (mesh_nexthop_lookup(hdr.addr1, skb, dev))
-                                return 0;
+                memset(hdr.addr1, 0, ETH_ALEN);
                 memcpy(hdr.addr2, dev->dev_addr, ETH_ALEN);
                 memcpy(hdr.addr3, skb->data, ETH_ALEN);
                 memcpy(hdr.addr4, skb->data + ETH_ALEN, ETH_ALEN);
-                if (skb->pkt_type == PACKET_OTHERHOST) {
-                        /* Forwarded frame, keep mesh ttl and seqnum */
-                        struct ieee80211s_hdr *prev_meshhdr;
-                        prev_meshhdr = ((struct ieee80211s_hdr *)skb->cb);
-                        meshhdrlen = ieee80211_get_mesh_hdrlen(prev_meshhdr);
-                        memcpy(&mesh_hdr, prev_meshhdr, meshhdrlen);
-                        sdata->u.sta.mshstats.fwded_frames++;
-                } else {
-                        if (!sdata->u.sta.mshcfg.dot11MeshTTL) {
-                                /* Do not send frames with mesh_ttl == 0 */
-                                sdata->u.sta.mshstats.dropped_frames_ttl++;
-                                ret = 0;
-                                goto fail;
-                        }
-                        meshhdrlen = ieee80211_new_mesh_header(&mesh_hdr,
-                                                               sdata);
+                if (!sdata->u.sta.mshcfg.dot11MeshTTL) {
+                        /* Do not send frames with mesh_ttl == 0 */
+                        sdata->u.sta.mshstats.dropped_frames_ttl++;
+                        ret = 0;
+                        goto fail;
                 }
+                meshhdrlen = ieee80211_new_mesh_header(&mesh_hdr, sdata);
                 hdrlen = 30;
                 break;
 #endif
@@ -1543,7 +1545,8 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
          * Drop unicast frames to unauthorised stations unless they are
          * EAPOL frames from the local station.
          */
-        if (unlikely(!is_multicast_ether_addr(hdr.addr1) &&
+        if (!ieee80211_vif_is_mesh(&sdata->vif) &&
+                unlikely(!is_multicast_ether_addr(hdr.addr1) &&
                       !(sta_flags & WLAN_STA_AUTHORIZED) &&
                       !(ethertype == ETH_P_PAE &&
                        compare_ether_addr(dev->dev_addr,
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index c519d090bdb9..9d1830da8e84 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1032,10 +1032,10 @@ void nf_conntrack_cleanup(void)
         nf_ct_free_hashtable(nf_conntrack_hash, nf_conntrack_vmalloc,
                              nf_conntrack_htable_size);
 
-        nf_conntrack_proto_fini();
-        nf_conntrack_helper_fini();
-        nf_conntrack_expect_fini();
         nf_conntrack_acct_fini();
+        nf_conntrack_expect_fini();
+        nf_conntrack_helper_fini();
+        nf_conntrack_proto_fini();
 }
 
 struct hlist_head *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 869ef9349d0f..8509db14670b 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -324,6 +324,7 @@ static int log_invalid_proto_min = 0;
 static int log_invalid_proto_max = 255;
 
 static struct ctl_table_header *nf_ct_sysctl_header;
+static struct ctl_table_header *nf_ct_netfilter_header;
 
 static ctl_table nf_ct_sysctl_table[] = {
         {
@@ -384,12 +385,6 @@ static ctl_table nf_ct_sysctl_table[] = {
 
 static ctl_table nf_ct_netfilter_table[] = {
         {
-                .ctl_name       = NET_NETFILTER,
-                .procname       = "netfilter",
-                .mode           = 0555,
-                .child          = nf_ct_sysctl_table,
-        },
-        {
                 .ctl_name       = NET_NF_CONNTRACK_MAX,
                 .procname       = "nf_conntrack_max",
                 .data           = &nf_conntrack_max,
@@ -409,18 +404,29 @@ EXPORT_SYMBOL_GPL(nf_ct_log_invalid);
 
 static int nf_conntrack_standalone_init_sysctl(void)
 {
-        nf_ct_sysctl_header =
+        nf_ct_netfilter_header =
                 register_sysctl_paths(nf_ct_path, nf_ct_netfilter_table);
-        if (nf_ct_sysctl_header == NULL) {
-                printk("nf_conntrack: can't register to sysctl.\n");
-                return -ENOMEM;
-        }
+        if (!nf_ct_netfilter_header)
+                goto out;
+
+        nf_ct_sysctl_header =
+                 register_sysctl_paths(nf_net_netfilter_sysctl_path,
+                                        nf_ct_sysctl_table);
+        if (!nf_ct_sysctl_header)
+                goto out_unregister_netfilter;
+
         return 0;
 
+out_unregister_netfilter:
+        unregister_sysctl_table(nf_ct_netfilter_header);
+out:
+        printk("nf_conntrack: can't register to sysctl.\n");
+        return -ENOMEM;
 }
 
 static void nf_conntrack_standalone_fini_sysctl(void)
 {
+        unregister_sysctl_table(nf_ct_netfilter_header);
         unregister_sysctl_table(nf_ct_sysctl_header);
 }
 #else
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 4840aff47256..ba1d121f3127 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -189,7 +189,7 @@ struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle)
 
         for (i = 0; i < dev->num_tx_queues; i++) {
                 struct netdev_queue *txq = netdev_get_tx_queue(dev, i);
-                struct Qdisc *q, *txq_root = txq->qdisc;
+                struct Qdisc *q, *txq_root = txq->qdisc_sleeping;
 
                 if (!(txq_root->flags & TCQ_F_BUILTIN) &&
                     txq_root->handle == handle)
@@ -792,8 +792,8 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
                                 goto err_out3;
                         }
                 }
-                if (parent && !(sch->flags & TCQ_F_INGRESS))
-                        list_add_tail(&sch->list, &dev_queue->qdisc->list);
+                if ((parent != TC_H_ROOT) && !(sch->flags & TCQ_F_INGRESS))
+                        list_add_tail(&sch->list, &dev_queue->qdisc_sleeping->list);
 
                 return sch;
         }
@@ -1236,11 +1236,11 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
                 q_idx = 0;
 
                 dev_queue = netdev_get_tx_queue(dev, 0);
-                if (tc_dump_qdisc_root(dev_queue->qdisc, skb, cb, &q_idx, s_q_idx) < 0)
+                if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0)
                         goto done;
 
                 dev_queue = &dev->rx_queue;
-                if (tc_dump_qdisc_root(dev_queue->qdisc, skb, cb, &q_idx, s_q_idx) < 0)
+                if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0)
                         goto done;
 
 cont:
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index b210a88d0960..7f07152bc109 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -57,7 +57,6 @@
 #include <linux/vmalloc.h>      /* vmalloc, vfree */
 #include <asm/uaccess.h>        /* copy_to/from_user */
 #include <linux/init.h>         /* __initfunc et al. */
-#include <net/syncppp.h>
 
 #define KMEM_SAFETYZONE 8
 
@@ -567,9 +566,6 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
 {
         wanif_conf_t *cnf;
         struct net_device *dev = NULL;
-#ifdef CONFIG_WANPIPE_MULTPPP
-        struct ppp_device *pppdev=NULL;
-#endif
         int err;
 
         if ((wandev->state == WAN_UNCONFIGURED) || (wandev->new_if == NULL))
@@ -588,25 +584,10 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
                 goto out;
 
         if (cnf->config_id == WANCONFIG_MPPP) {
-#ifdef CONFIG_WANPIPE_MULTPPP
-                pppdev = kzalloc(sizeof(struct ppp_device), GFP_KERNEL);
-                err = -ENOBUFS;
-                if (pppdev == NULL)
-                        goto out;
-                pppdev->dev = kzalloc(sizeof(struct net_device), GFP_KERNEL);
-                if (pppdev->dev == NULL) {
-                        kfree(pppdev);
-                        err = -ENOBUFS;
-                        goto out;
-                }
-                err = wandev->new_if(wandev, (struct net_device *)pppdev, cnf);
-                dev = pppdev->dev;
-#else
                 printk(KERN_INFO "%s: Wanpipe Mulit-Port PPP support has not been compiled in!\n",
                                 wandev->name);
                 err = -EPROTONOSUPPORT;
                 goto out;
-#endif
         } else {
                 dev = kzalloc(sizeof(struct net_device), GFP_KERNEL);
                 err = -ENOBUFS;
@@ -661,17 +642,9 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
         kfree(dev->priv);
         dev->priv = NULL;
 
-#ifdef CONFIG_WANPIPE_MULTPPP
-        if (cnf->config_id == WANCONFIG_MPPP)
-                kfree(pppdev);
-        else
-                kfree(dev);
-#else
         /* Sync PPP is disabled */
         if (cnf->config_id != WANCONFIG_MPPP)
                 kfree(dev);
-#endif
-
 out:
         kfree(cnf);
         return err;