Merge branch 'upstream-fixes'

85 files changed, 1246 insertions, 946 deletions

diff --git a/net/802/p8022.c b/net/802/p8022.c
index b24817c63ca8..2530f35241cd 100644
--- a/net/802/p8022.c
+++ b/net/802/p8022.c
@@ -56,7 +56,7 @@ struct datalink_proto *register_8022_client(unsigned char type,
 
 void unregister_8022_client(struct datalink_proto *proto)
 {
-        llc_sap_close(proto->sap);
+        llc_sap_put(proto->sap);
         kfree(proto);
 }
 
diff --git a/net/802/psnap.c b/net/802/psnap.c
index ab80b1fab53c..4d638944d933 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -106,7 +106,7 @@ module_init(snap_init);
 
 static void __exit snap_exit(void)
 {
-        llc_sap_close(snap_sap);
+        llc_sap_put(snap_sap);
 }
 
 module_exit(snap_exit);
diff --git a/net/802/tr.c b/net/802/tr.c
index 1bb7dc1b85cd..1eaa3d19d8bf 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -238,7 +238,7 @@ unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev)
                 return trllc->ethertype;
         }
 
-        return ntohs(ETH_P_802_2);
+        return ntohs(ETH_P_TR_802_2);
 }
 
 /*
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 1d31b3a3f1e5..7982656b9c83 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -100,8 +100,7 @@ static struct sock *atalk_search_socket(struct sockaddr_at *to,
                         continue;
 
                 if (to->sat_addr.s_net == ATADDR_ANYNET &&
-                    to->sat_addr.s_node == ATADDR_BCAST &&
-                    at->src_net == atif->address.s_net)
+                    to->sat_addr.s_node == ATADDR_BCAST)
                         goto found;
 
                 if (to->sat_addr.s_net == at->src_net &&
@@ -1443,8 +1442,10 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev,
         else
                 atif = atalk_find_interface(ddp->deh_dnet, ddp->deh_dnode);
 
-        /* Not ours, so we route the packet via the correct AppleTalk iface */
         if (!atif) {
+                /* Not ours, so we route the packet via the correct
+                 * AppleTalk iface
+                 */
                 atalk_route_packet(skb, dev, ddp, &ddphv, origlen);
                 goto out;
         }
@@ -1592,9 +1593,6 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
 
         if (usat->sat_addr.s_net || usat->sat_addr.s_node == ATADDR_ANYNODE) {
                 rt = atrtr_find(&usat->sat_addr);
-                if (!rt)
-                        return -ENETUNREACH;
-
                 dev = rt->dev;
         } else {
                 struct atalk_addr at_hint;
@@ -1603,11 +1601,12 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
                 at_hint.s_net  = at->src_net;
 
                 rt = atrtr_find(&at_hint);
-                if (!rt)
-                        return -ENETUNREACH;
-
                 dev = rt->dev;
         }
+        if (!rt)
+                return -ENETUNREACH;
+
+        dev = rt->dev;
 
         SOCK_DEBUG(sk, "SK %p: Size needed %d, device %s\n",
                         sk, size, dev->name);
@@ -1677,6 +1676,20 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
                 SOCK_DEBUG(sk, "SK %p: Loop back.\n", sk);
                 /* loop back */
                 skb_orphan(skb);
+                if (ddp->deh_dnode == ATADDR_BCAST) {
+                        struct atalk_addr at_lo;
+
+                        at_lo.s_node = 0;
+                        at_lo.s_net  = 0;
+
+                        rt = atrtr_find(&at_lo);
+                        if (!rt) {
+                                kfree_skb(skb);
+                                return -ENETUNREACH;
+                        }
+                        dev = rt->dev;
+                        skb->dev = dev;
+                }
                 ddp_dl->request(ddp_dl, skb, dev->dev_addr);
         } else {
                 SOCK_DEBUG(sk, "SK %p: send out.\n", sk);
diff --git a/net/atm/addr.c b/net/atm/addr.c
index 1c8867f7f54a..a30d0bf48063 100644
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -50,8 +50,10 @@ void atm_reset_addr(struct atm_dev *dev)
         struct atm_dev_addr *this, *p;
 
         spin_lock_irqsave(&dev->lock, flags);
-        list_for_each_entry_safe(this, p, &dev->local, entry)
-            kfree(this);
+        list_for_each_entry_safe(this, p, &dev->local, entry) {
+                list_del(&this->entry);
+                kfree(this);
+        }
         spin_unlock_irqrestore(&dev->lock, flags);
         notify_sigd(dev);
 }
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 28dab55a4387..4f54c9a5e84a 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -310,7 +310,7 @@ static int clip_constructor(struct neighbour *neigh)
         if (neigh->type != RTN_UNICAST) return -EINVAL;
 
         rcu_read_lock();
-        in_dev = rcu_dereference(__in_dev_get(dev));
+        in_dev = __in_dev_get_rcu(dev);
         if (!in_dev) {
                 rcu_read_unlock();
                 return -EINVAL;
diff --git a/net/atm/common.c b/net/atm/common.c
index e93e838069e8..63feea49fb13 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -46,7 +46,7 @@ static void __vcc_insert_socket(struct sock *sk)
         struct atm_vcc *vcc = atm_sk(sk);
         struct hlist_head *head = &vcc_hash[vcc->vci &
                                         (VCC_HTABLE_SIZE - 1)];
-        sk->sk_hashent = vcc->vci & (VCC_HTABLE_SIZE - 1);
+        sk->sk_hash = vcc->vci & (VCC_HTABLE_SIZE - 1);
         sk_add_node(sk, head);
 }
 
@@ -178,8 +178,6 @@ static void vcc_destroy_socket(struct sock *sk)
                 if (vcc->push)
                         vcc->push(vcc, NULL); /* atmarpd has no push */
 
-                vcc_remove_socket(sk);  /* no more receive */
-
                 while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
                         atm_return(vcc,skb->truesize);
                         kfree_skb(skb);
@@ -188,6 +186,8 @@ static void vcc_destroy_socket(struct sock *sk)
                 module_put(vcc->dev->ops->owner);
                 atm_dev_put(vcc->dev);
         }
+
+        vcc_remove_socket(sk);
 }
 
 
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index d89056ec44d4..a150198b05a3 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -105,17 +105,35 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         if (!error)
                                 sock->state = SS_CONNECTED;
                         goto done;
-                default:
+                case ATM_SETBACKEND:
+                case ATM_NEWBACKENDIF:
+                        {
+                                atm_backend_t backend;
+                                error = get_user(backend, (atm_backend_t __user *) argp);
+                                if (error)
+                                        goto done;
+                                switch (backend) {
+                                        case ATM_BACKEND_PPP:
+                                                request_module("pppoatm");
+                                                break;
+                                        case ATM_BACKEND_BR2684:
+                                                request_module("br2684");
+                                                break;
+                                }
+                        }
+                        break;
+                case ATMMPC_CTRL:
+                case ATMMPC_DATA:
+                        request_module("mpoa");
+                        break;
+                case ATMARPD_CTRL:
+                        request_module("clip");
+                        break;
+                case ATMLEC_CTRL:
+                        request_module("lec");
                         break;
         }
 
-        if (cmd == ATMMPC_CTRL || cmd == ATMMPC_DATA)
-                request_module("mpoa");
-        if (cmd == ATMARPD_CTRL)
-                request_module("clip");
-        if (cmd == ATMLEC_CTRL)
-                request_module("lec");
-
         error = -ENOIOCTLCMD;
 
         down(&ioctl_mutex);
diff --git a/net/atm/lec.c b/net/atm/lec.c
index a0752487026d..ad840b9afba8 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -686,9 +686,19 @@ static unsigned char lec_ctrl_magic[] = {
         0x01,
         0x01 };
 
+#define LEC_DATA_DIRECT_8023  2
+#define LEC_DATA_DIRECT_8025  3
+
+static int lec_is_data_direct(struct atm_vcc *vcc)
+{ 
+        return ((vcc->sap.blli[0].l3.tr9577.snap[4] == LEC_DATA_DIRECT_8023) ||
+                (vcc->sap.blli[0].l3.tr9577.snap[4] == LEC_DATA_DIRECT_8025));
+} 
+
 static void 
 lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
 {
+        unsigned long flags;
         struct net_device *dev = (struct net_device *)vcc->proto_data;
         struct lec_priv *priv = (struct lec_priv *)dev->priv; 
 
@@ -728,7 +738,8 @@ lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                 skb_queue_tail(&sk->sk_receive_queue, skb);
                 sk->sk_data_ready(sk, skb->len);
         } else { /* Data frame, queue to protocol handlers */
-                unsigned char *dst;
+                struct lec_arp_table *entry;
+                unsigned char *src, *dst;
 
                 atm_return(vcc,skb->truesize);
                 if (*(uint16_t *)skb->data == htons(priv->lecid) ||
@@ -741,10 +752,30 @@ lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                         return;
                 }
 #ifdef CONFIG_TR
-                if (priv->is_trdev) dst = ((struct lecdatahdr_8025 *)skb->data)->h_dest;
+                if (priv->is_trdev)
+                        dst = ((struct lecdatahdr_8025 *) skb->data)->h_dest;
                 else
 #endif
-                dst = ((struct lecdatahdr_8023 *)skb->data)->h_dest;
+                dst = ((struct lecdatahdr_8023 *) skb->data)->h_dest;
+
+                /* If this is a Data Direct VCC, and the VCC does not match
+                 * the LE_ARP cache entry, delete the LE_ARP cache entry.
+                 */
+                spin_lock_irqsave(&priv->lec_arp_lock, flags);
+                if (lec_is_data_direct(vcc)) {
+#ifdef CONFIG_TR
+                        if (priv->is_trdev)
+                                src = ((struct lecdatahdr_8025 *) skb->data)->h_source;
+                        else
+#endif
+                        src = ((struct lecdatahdr_8023 *) skb->data)->h_source;
+                        entry = lec_arp_find(priv, src);
+                        if (entry && entry->vcc != vcc) {
+                                lec_arp_remove(priv, entry);
+                                kfree(entry);
+                        }
+                }
+                spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
 
                 if (!(dst[0]&0x01) &&   /* Never filter Multi/Broadcast */
                     !priv->is_proxy &&  /* Proxy wants all the packets */
@@ -1990,6 +2021,12 @@ lec_arp_resolve(struct lec_priv *priv, unsigned char *mac_to_find,
                         found = entry->vcc;
                         goto out;
                 }
+                /* If the LE_ARP cache entry is still pending, reset count to 0
+                 * so another LE_ARP request can be made for this frame.
+                 */
+                if (entry->status == ESI_ARP_PENDING) {
+                        entry->no_tries = 0;
+                }
                 /* Data direct VC not yet set up, check to see if the unknown
                    frame count is greater than the limit. If the limit has
                    not been reached, allow the caller to send packet to
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index f7c449ac1800..e7211a7f382c 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -217,8 +217,9 @@ void sigd_enq(struct atm_vcc *vcc,enum atmsvc_msg_type type,
 static void purge_vcc(struct atm_vcc *vcc)
 {
         if (sk_atm(vcc)->sk_family == PF_ATMSVC &&
-            !test_bit(ATM_VF_META,&vcc->flags)) {
-                set_bit(ATM_VF_RELEASED,&vcc->flags);
+            !test_bit(ATM_VF_META, &vcc->flags)) {
+                set_bit(ATM_VF_RELEASED, &vcc->flags);
+                clear_bit(ATM_VF_REGIS, &vcc->flags);
                 vcc_release_async(vcc, -EUNATCH);
         }
 }
@@ -243,8 +244,7 @@ static void sigd_close(struct atm_vcc *vcc)
                 sk_for_each(s, node, head) {
                         struct atm_vcc *vcc = atm_sk(s);
 
-                        if (vcc->dev)
-                                purge_vcc(vcc);
+                        purge_vcc(vcc);
                 }
         }
         read_unlock(&vcc_sklist_lock);
diff --git a/net/atm/svc.c b/net/atm/svc.c
index 08e46052a3e4..d7b266136bf6 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -302,6 +302,7 @@ static int svc_listen(struct socket *sock,int backlog)
                 error = -EINVAL;
                 goto out;
         }
+        vcc_insert_socket(sk);
         set_bit(ATM_VF_WAITING, &vcc->flags);
         prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE);
         sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local);
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 069253f830c1..2d24fb400e0c 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -31,7 +31,8 @@ static inline int should_deliver(const struct net_bridge_port *p,
 
 int br_dev_queue_push_xmit(struct sk_buff *skb)
 {
-        if (skb->len > skb->dev->mtu) 
+        /* drop mtu oversized packets except tso */
+        if (skb->len > skb->dev->mtu && !skb_shinfo(skb)->tso_size)
                 kfree_skb(skb);
         else {
 #ifdef CONFIG_BRIDGE_NETFILTER
diff --git a/net/core/datagram.c b/net/core/datagram.c
index da9bf71421a7..81987df536eb 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -211,74 +211,45 @@ void skb_free_datagram(struct sock *sk, struct sk_buff *skb)
 int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
                             struct iovec *to, int len)
 {
-        int start = skb_headlen(skb);
-        int i, copy = start - offset;
-
-        /* Copy header. */
-        if (copy > 0) {
-                if (copy > len)
-                        copy = len;
-                if (memcpy_toiovec(to, skb->data + offset, copy))
-                        goto fault;
-                if ((len -= copy) == 0)
-                        return 0;
-                offset += copy;
-        }
+        int i, err, fraglen, end = 0;
+        struct sk_buff *next = skb_shinfo(skb)->frag_list;
+next_skb:
+        fraglen = skb_headlen(skb);
+        i = -1;
 
-        /* Copy paged appendix. Hmm... why does this look so complicated? */
-        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                int end;
-
-                BUG_TRAP(start <= offset + len);
+        while (1) {
+                int start = end;
 
-                end = start + skb_shinfo(skb)->frags[i].size;
-                if ((copy = end - offset) > 0) {
-                        int err;
-                        u8  *vaddr;
-                        skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                        struct page *page = frag->page;
+                if ((end += fraglen) > offset) {
+                        int copy = end - offset, o = offset - start;
 
                         if (copy > len)
                                 copy = len;
-                        vaddr = kmap(page);
-                        err = memcpy_toiovec(to, vaddr + frag->page_offset +
-                                             offset - start, copy);
-                        kunmap(page);
+                        if (i == -1)
+                                err = memcpy_toiovec(to, skb->data + o, copy);
+                        else {
+                                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+                                struct page *page = frag->page;
+                                void *p = kmap(page) + frag->page_offset + o;
+                                err = memcpy_toiovec(to, p, copy);
+                                kunmap(page);
+                        }
                         if (err)
                                 goto fault;
                         if (!(len -= copy))
                                 return 0;
                         offset += copy;
                 }
-                start = end;
+                if (++i >= skb_shinfo(skb)->nr_frags)
+                        break;
+                fraglen = skb_shinfo(skb)->frags[i].size;
         }
-
-        if (skb_shinfo(skb)->frag_list) {
-                struct sk_buff *list = skb_shinfo(skb)->frag_list;
-
-                for (; list; list = list->next) {
-                        int end;
-
-                        BUG_TRAP(start <= offset + len);
-
-                        end = start + list->len;
-                        if ((copy = end - offset) > 0) {
-                                if (copy > len)
-                                        copy = len;
-                                if (skb_copy_datagram_iovec(list,
-                                                            offset - start,
-                                                            to, copy))
-                                        goto fault;
-                                if ((len -= copy) == 0)
-                                        return 0;
-                                offset += copy;
-                        }
-                        start = end;
-                }
+        if (next) {
+                skb = next;
+                BUG_ON(skb_shinfo(skb)->frag_list);
+                next = skb->next;
+                goto next_skb;
         }
-        if (!len)
-                return 0;
-
 fault:
         return -EFAULT;
 }
diff --git a/net/core/dev.c b/net/core/dev.c
index c01511e3d0c1..9066c874e273 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -574,6 +574,8 @@ struct net_device *dev_getbyhwaddr(unsigned short type, char *ha)
         return dev;
 }
 
+EXPORT_SYMBOL(dev_getbyhwaddr);
+
 struct net_device *dev_getfirstbyhwtype(unsigned short type)
 {
         struct net_device *dev;
@@ -1257,6 +1259,8 @@ int dev_queue_xmit(struct sk_buff *skb)
                 if (skb_checksum_help(skb, 0))
                         goto out_kfree_skb;
 
+        spin_lock_prefetch(&dev->queue_lock);
+
         /* Disable soft irqs for various locks below. Also 
          * stops preemption for RCU. 
          */
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 39fc55edf691..4128fc76ac3a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -61,7 +61,9 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev);
 void neigh_changeaddr(struct neigh_table *tbl, struct net_device *dev);
 
 static struct neigh_table *neigh_tables;
+#ifdef CONFIG_PROC_FS
 static struct file_operations neigh_stat_seq_fops;
+#endif
 
 /*
    Neighbour hash table buckets are protected with rwlock tbl->lock.
@@ -725,6 +727,13 @@ static __inline__ int neigh_max_probes(struct neighbour *n)
                 p->ucast_probes + p->app_probes + p->mcast_probes);
 }
 
+static inline void neigh_add_timer(struct neighbour *n, unsigned long when)
+{
+        if (unlikely(mod_timer(&n->timer, when))) {
+                printk("NEIGH: BUG, double timer add, state is %x\n",
+                       n->nud_state);
+        }
+}
 
 /* Called when a timer expires for a neighbour entry. */
 
@@ -809,8 +818,7 @@ static void neigh_timer_handler(unsigned long arg)
                 neigh_hold(neigh);
                 if (time_before(next, jiffies + HZ/2))
                         next = jiffies + HZ/2;
-                neigh->timer.expires = next;
-                add_timer(&neigh->timer);
+                neigh_add_timer(neigh, next);
         }
         if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) {
                 struct sk_buff *skb = skb_peek(&neigh->arp_queue);
@@ -852,8 +860,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
                         atomic_set(&neigh->probes, neigh->parms->ucast_probes);
                         neigh->nud_state     = NUD_INCOMPLETE;
                         neigh_hold(neigh);
-                        neigh->timer.expires = now + 1;
-                        add_timer(&neigh->timer);
+                        neigh_add_timer(neigh, now + 1);
                 } else {
                         neigh->nud_state = NUD_FAILED;
                         write_unlock_bh(&neigh->lock);
@@ -866,8 +873,8 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
                 NEIGH_PRINTK2("neigh %p is delayed.\n", neigh);
                 neigh_hold(neigh);
                 neigh->nud_state = NUD_DELAY;
-                neigh->timer.expires = jiffies + neigh->parms->delay_probe_time;
-                add_timer(&neigh->timer);
+                neigh_add_timer(neigh,
+                                jiffies + neigh->parms->delay_probe_time);
         }
 
         if (neigh->nud_state == NUD_INCOMPLETE) {
@@ -1013,10 +1020,10 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
                 neigh_del_timer(neigh);
                 if (new & NUD_IN_TIMER) {
                         neigh_hold(neigh);
-                        neigh->timer.expires = jiffies + 
+                        neigh_add_timer(neigh, (jiffies + 
                                                 ((new & NUD_REACHABLE) ? 
-                                                 neigh->parms->reachable_time : 0);
-                        add_timer(&neigh->timer);
+                                                 neigh->parms->reachable_time :
+                                                 0)));
                 }
                 neigh->nud_state = new;
         }
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 5265dfd69928..802fe11efad0 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -703,7 +703,7 @@ int netpoll_setup(struct netpoll *np)
 
         if (!np->local_ip) {
                 rcu_read_lock();
-                in_dev = __in_dev_get(ndev);
+                in_dev = __in_dev_get_rcu(ndev);
 
                 if (!in_dev || !in_dev->ifa_list) {
                         rcu_read_unlock();
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index ef430b1e8e42..5f043d346694 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -186,7 +186,7 @@
 
 /* Used to help with determining the pkts on receive */
 #define PKTGEN_MAGIC 0xbe9be955
-#define PG_PROC_DIR "pktgen"
+#define PG_PROC_DIR "net/pktgen"
 
 #define MAX_CFLOWS  65536
 
@@ -1476,18 +1476,7 @@ static int proc_thread_write(struct file *file, const char __user *user_buffer,
 
 static int create_proc_dir(void)
 {
-        int     len;
-        /*  does proc_dir already exists */
-        len = strlen(PG_PROC_DIR);
-
-        for (pg_proc_dir = proc_net->subdir; pg_proc_dir; pg_proc_dir=pg_proc_dir->next) {
-                if ((pg_proc_dir->namelen == len) &&
-                    (! memcmp(pg_proc_dir->name, PG_PROC_DIR, len))) 
-                        break;
-        }
-        
-        if (!pg_proc_dir) 
-                pg_proc_dir = create_proc_entry(PG_PROC_DIR, S_IFDIR, proc_net);
+        pg_proc_dir = proc_mkdir(PG_PROC_DIR, NULL);
         
         if (!pg_proc_dir) 
                 return -ENODEV;
@@ -1497,7 +1486,7 @@ static int create_proc_dir(void)
 
 static int remove_proc_dir(void)
 {
-        remove_proc_entry(PG_PROC_DIR, proc_net);
+        remove_proc_entry(PG_PROC_DIR, NULL);
         return 0;
 }
 
@@ -1678,13 +1667,12 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
                         struct in_device *in_dev; 
 
                         rcu_read_lock();
-                        in_dev = __in_dev_get(pkt_dev->odev);
+                        in_dev = __in_dev_get_rcu(pkt_dev->odev);
                         if (in_dev) {
                                 if (in_dev->ifa_list) {
                                         pkt_dev->saddr_min = in_dev->ifa_list->ifa_address;
                                         pkt_dev->saddr_max = pkt_dev->saddr_min;
                                 }
-                                __in_dev_put(in_dev);   
                         }
                         rcu_read_unlock();
                 }
@@ -2908,7 +2896,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char* ifname)
                 pkt_dev->udp_dst_max = 9;
 
                 strncpy(pkt_dev->ifname, ifname, 31);
-                sprintf(pkt_dev->fname, "net/%s/%s", PG_PROC_DIR, ifname);
+                sprintf(pkt_dev->fname, "%s/%s", PG_PROC_DIR, ifname);
 
                 if (! pktgen_setup_dev(pkt_dev)) {
                         printk("pktgen: ERROR: pktgen_setup_dev failed.\n");
@@ -2981,7 +2969,7 @@ static int pktgen_create_thread(const char* name, int cpu)
         spin_lock_init(&t->if_lock);
         t->cpu = cpu;
         
-        sprintf(t->fname, "net/%s/%s", PG_PROC_DIR, t->name);
+        sprintf(t->fname, "%s/%s", PG_PROC_DIR, t->name);
         t->proc_ent = create_proc_entry(t->fname, 0600, NULL);
         if (!t->proc_ent) {
                 printk("pktgen: cannot create %s procfs entry.\n", t->fname);
@@ -3064,7 +3052,7 @@ static int __init pg_init(void)
 
         create_proc_dir();
 
-        sprintf(module_fname, "net/%s/pgctrl", PG_PROC_DIR);
+        sprintf(module_fname, "%s/pgctrl", PG_PROC_DIR);
         module_proc_ent = create_proc_entry(module_fname, 0600, NULL);
         if (!module_proc_ent) {
                 printk("pktgen: ERROR: cannot create %s procfs entry.\n", module_fname);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f80a28785610..0e9431b59fb2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -71,8 +71,6 @@
 static kmem_cache_t *skbuff_head_cache __read_mostly;
 static kmem_cache_t *skbuff_fclone_cache __read_mostly;
 
-struct timeval __read_mostly skb_tv_base;
-
 /*
  *      Keep out-of-line to prevent kernel bloat.
  *      __builtin_return_address is not used because it is not always
@@ -1708,8 +1706,6 @@ void __init skb_init(void)
                                                 NULL, NULL);
         if (!skbuff_fclone_cache)
                 panic("cannot create skbuff cache");
-
-        do_gettimeofday(&skb_tv_base);
 }
 
 EXPORT_SYMBOL(___pskb_trim);
@@ -1743,4 +1739,3 @@ EXPORT_SYMBOL(skb_prepare_seq_read);
 EXPORT_SYMBOL(skb_seq_read);
 EXPORT_SYMBOL(skb_abort_seq_read);
 EXPORT_SYMBOL(skb_find_text);
-EXPORT_SYMBOL(skb_tv_base);
diff --git a/net/core/sock.c b/net/core/sock.c
index ac63b56e23b2..928d2a1d6d8e 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -660,16 +660,20 @@ struct sock *sk_alloc(int family, unsigned int __nocast priority,
                         sock_lock_init(sk);
                 }
                 
-                if (security_sk_alloc(sk, family, priority)) {
-                        if (slab != NULL)
-                                kmem_cache_free(slab, sk);
-                        else
-                                kfree(sk);
-                        sk = NULL;
-                } else
-                        __module_get(prot->owner);
+                if (security_sk_alloc(sk, family, priority))
+                        goto out_free;
+
+                if (!try_module_get(prot->owner))
+                        goto out_free;
         }
         return sk;
+
+out_free:
+        if (slab != NULL)
+                kmem_cache_free(slab, sk);
+        else
+                kfree(sk);
+        return NULL;
 }
 
 void sk_free(struct sock *sk)
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 40fe6afacde6..ae088d1347af 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -62,27 +62,27 @@ static int __dccp_v4_check_established(struct sock *sk, const __u16 lport,
         const int dif = sk->sk_bound_dev_if;
         INET_ADDR_COOKIE(acookie, saddr, daddr)
         const __u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-        const int hash = inet_ehashfn(daddr, lport, saddr, inet->dport,
-                                      dccp_hashinfo.ehash_size);
-        struct inet_ehash_bucket *head = &dccp_hashinfo.ehash[hash];
+        unsigned int hash = inet_ehashfn(daddr, lport, saddr, inet->dport);
+        struct inet_ehash_bucket *head = inet_ehash_bucket(&dccp_hashinfo, hash);
         const struct sock *sk2;
         const struct hlist_node *node;
         struct inet_timewait_sock *tw;
 
+        prefetch(head->chain.first);
         write_lock(&head->lock);
 
         /* Check TIME-WAIT sockets first. */
         sk_for_each(sk2, node, &(head + dccp_hashinfo.ehash_size)->chain) {
                 tw = inet_twsk(sk2);
 
-                if (INET_TW_MATCH(sk2, acookie, saddr, daddr, ports, dif))
+                if (INET_TW_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif))
                         goto not_unique;
         }
         tw = NULL;
 
         /* And established part... */
         sk_for_each(sk2, node, &head->chain) {
-                if (INET_MATCH(sk2, acookie, saddr, daddr, ports, dif))
+                if (INET_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif))
                         goto not_unique;
         }
 
@@ -90,7 +90,7 @@ static int __dccp_v4_check_established(struct sock *sk, const __u16 lport,
          * in hash table socket with a funny identity. */
         inet->num = lport;
         inet->sport = htons(lport);
-        sk->sk_hashent = hash;
+        sk->sk_hash = hash;
         BUG_TRAP(sk_unhashed(sk));
         __sk_add_node(sk, &head->chain);
         sock_prot_inc_use(sk->sk_prot);
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 4a62093eb343..34fdac51df96 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -406,7 +406,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
                 unsigned long network = 0;
 
                 rcu_read_lock();
-                idev = __in_dev_get(dev);
+                idev = __in_dev_get_rcu(dev);
                 if (idev) {
                         if (idev->ifa_list)
                                 network = ntohl(idev->ifa_list->ifa_address) & 
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 87a052a9a84f..68a5ca866442 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -146,6 +146,19 @@ int eth_rebuild_header(struct sk_buff *skb)
         return 0;
 }
 
+static inline unsigned int compare_eth_addr(const unsigned char *__a, const unsigned char *__b)
+{
+        const unsigned short *dest = (unsigned short *) __a;
+        const unsigned short *devaddr = (unsigned short *) __b;
+        unsigned int res;
+
+        BUILD_BUG_ON(ETH_ALEN != 6);
+        res = ((dest[0] ^ devaddr[0]) |
+               (dest[1] ^ devaddr[1]) |
+               (dest[2] ^ devaddr[2])) != 0;
+
+        return res;
+}
 
 /*
  *      Determine the packet's protocol ID. The rule here is that we 
@@ -158,16 +171,15 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
         struct ethhdr *eth;
         unsigned char *rawp;
         
-        skb->mac.raw=skb->data;
+        skb->mac.raw = skb->data;
         skb_pull(skb,ETH_HLEN);
         eth = eth_hdr(skb);
         
-        if(*eth->h_dest&1)
-        {
-                if(memcmp(eth->h_dest,dev->broadcast, ETH_ALEN)==0)
-                        skb->pkt_type=PACKET_BROADCAST;
+        if (*eth->h_dest&1) {
+                if (!compare_eth_addr(eth->h_dest, dev->broadcast))
+                        skb->pkt_type = PACKET_BROADCAST;
                 else
-                        skb->pkt_type=PACKET_MULTICAST;
+                        skb->pkt_type = PACKET_MULTICAST;
         }
         
         /*
@@ -178,10 +190,9 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
          *      seems to set IFF_PROMISC.
          */
          
-        else if(1 /*dev->flags&IFF_PROMISC*/)
-        {
-                if(memcmp(eth->h_dest,dev->dev_addr, ETH_ALEN))
-                        skb->pkt_type=PACKET_OTHERHOST;
+        else if(1 /*dev->flags&IFF_PROMISC*/) {
+                if (unlikely(compare_eth_addr(eth->h_dest, dev->dev_addr)))
+                        skb->pkt_type = PACKET_OTHERHOST;
         }
         
         if (ntohs(eth->h_proto) >= 1536)
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 5714692e82b4..f66d792cd204 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -230,7 +230,7 @@ static int __init ieee80211_init(void)
         struct proc_dir_entry *e;
 
         ieee80211_debug_level = debug;
-        ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, proc_net);
+        ieee80211_proc = proc_mkdir(DRV_NAME, proc_net);
         if (ieee80211_proc == NULL) {
                 IEEE80211_ERROR("Unable to create " DRV_NAME
                                 " proc directory\n");
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 8d87897d7eb7..e860777ab8d3 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -187,7 +187,7 @@ void ieee80211_txb_free(struct ieee80211_txb *txb)
 }
 
 static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
-                                                 int gfp_mask)
+                                                 unsigned int gfp_mask)
 {
         struct ieee80211_txb *txb;
         int i;
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 8bf312bdea13..b425748f02d7 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -241,7 +241,7 @@ static int arp_constructor(struct neighbour *neigh)
         neigh->type = inet_addr_type(addr);
 
         rcu_read_lock();
-        in_dev = rcu_dereference(__in_dev_get(dev));
+        in_dev = __in_dev_get_rcu(dev);
         if (in_dev == NULL) {
                 rcu_read_unlock();
                 return -EINVAL;
@@ -697,12 +697,6 @@ void arp_send(int type, int ptype, u32 dest_ip,
         arp_xmit(skb);
 }
 
-static void parp_redo(struct sk_buff *skb)
-{
-        nf_reset(skb);
-        arp_rcv(skb, skb->dev, NULL, skb->dev);
-}
-
 /*
  *      Process an arp request.
  */
@@ -922,6 +916,11 @@ out:
         return 0;
 }
 
+static void parp_redo(struct sk_buff *skb)
+{
+        arp_process(skb);
+}
+
 
 /*
  *      Receive an arp request from the device layer.
@@ -990,8 +989,8 @@ static int arp_req_set(struct arpreq *r, struct net_device * dev)
                         ipv4_devconf.proxy_arp = 1;
                         return 0;
                 }
-                if (__in_dev_get(dev)) {
-                        __in_dev_get(dev)->cnf.proxy_arp = 1;
+                if (__in_dev_get_rtnl(dev)) {
+                        __in_dev_get_rtnl(dev)->cnf.proxy_arp = 1;
                         return 0;
                 }
                 return -ENXIO;
@@ -1096,8 +1095,8 @@ static int arp_req_delete(struct arpreq *r, struct net_device * dev)
                                 ipv4_devconf.proxy_arp = 0;
                                 return 0;
                         }
-                        if (__in_dev_get(dev)) {
-                                __in_dev_get(dev)->cnf.proxy_arp = 0;
+                        if (__in_dev_get_rtnl(dev)) {
+                                __in_dev_get_rtnl(dev)->cnf.proxy_arp = 0;
                                 return 0;
                         }
                         return -ENXIO;
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index ba2895ae8151..74f2207e131a 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -351,7 +351,7 @@ static int inet_insert_ifa(struct in_ifaddr *ifa)
 
 static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
 {
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
 
         ASSERT_RTNL();
 
@@ -449,7 +449,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg
                 goto out;
 
         rc = -ENOBUFS;
-        if ((in_dev = __in_dev_get(dev)) == NULL) {
+        if ((in_dev = __in_dev_get_rtnl(dev)) == NULL) {
                 in_dev = inetdev_init(dev);
                 if (!in_dev)
                         goto out;
@@ -584,7 +584,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
         if (colon)
                 *colon = ':';
 
-        if ((in_dev = __in_dev_get(dev)) != NULL) {
+        if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
                 if (tryaddrmatch) {
                         /* Matthias Andree */
                         /* compare label and address (4.4BSD style) */
@@ -748,7 +748,7 @@ rarok:
 
 static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
 {
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
         struct in_ifaddr *ifa;
         struct ifreq ifr;
         int done = 0;
@@ -791,7 +791,7 @@ u32 inet_select_addr(const struct net_device *dev, u32 dst, int scope)
         struct in_device *in_dev;
 
         rcu_read_lock();
-        in_dev = __in_dev_get(dev);
+        in_dev = __in_dev_get_rcu(dev);
         if (!in_dev)
                 goto no_in_dev;
 
@@ -818,7 +818,7 @@ no_in_dev:
         read_lock(&dev_base_lock);
         rcu_read_lock();
         for (dev = dev_base; dev; dev = dev->next) {
-                if ((in_dev = __in_dev_get(dev)) == NULL)
+                if ((in_dev = __in_dev_get_rcu(dev)) == NULL)
                         continue;
 
                 for_primary_ifa(in_dev) {
@@ -887,7 +887,7 @@ u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scop
 
         if (dev) {
                 rcu_read_lock();
-                if ((in_dev = __in_dev_get(dev)))
+                if ((in_dev = __in_dev_get_rcu(dev)))
                         addr = confirm_addr_indev(in_dev, dst, local, scope);
                 rcu_read_unlock();
 
@@ -897,7 +897,7 @@ u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scop
         read_lock(&dev_base_lock);
         rcu_read_lock();
         for (dev = dev_base; dev; dev = dev->next) {
-                if ((in_dev = __in_dev_get(dev))) {
+                if ((in_dev = __in_dev_get_rcu(dev))) {
                         addr = confirm_addr_indev(in_dev, dst, local, scope);
                         if (addr)
                                 break;
@@ -957,7 +957,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
                          void *ptr)
 {
         struct net_device *dev = ptr;
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
 
         ASSERT_RTNL();
 
@@ -1078,7 +1078,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
                 if (idx > s_idx)
                         s_ip_idx = 0;
                 rcu_read_lock();
-                if ((in_dev = __in_dev_get(dev)) == NULL) {
+                if ((in_dev = __in_dev_get_rcu(dev)) == NULL) {
                         rcu_read_unlock();
                         continue;
                 }
@@ -1149,7 +1149,7 @@ void inet_forward_change(void)
         for (dev = dev_base; dev; dev = dev->next) {
                 struct in_device *in_dev;
                 rcu_read_lock();
-                in_dev = __in_dev_get(dev);
+                in_dev = __in_dev_get_rcu(dev);
                 if (in_dev)
                         in_dev->cnf.forwarding = on;
                 rcu_read_unlock();
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 4e1379f71269..e61bc7177eb1 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -173,7 +173,7 @@ int fib_validate_source(u32 src, u32 dst, u8 tos, int oif,
 
         no_addr = rpf = 0;
         rcu_read_lock();
-        in_dev = __in_dev_get(dev);
+        in_dev = __in_dev_get_rcu(dev);
         if (in_dev) {
                 no_addr = in_dev->ifa_list == NULL;
                 rpf = IN_DEV_RPFILTER(in_dev);
@@ -607,7 +607,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
 static int fib_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
         struct net_device *dev = ptr;
-        struct in_device *in_dev = __in_dev_get(dev);
+        struct in_device *in_dev = __in_dev_get_rtnl(dev);
 
         if (event == NETDEV_UNREGISTER) {
                 fib_disable_ip(dev, 2);
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index d41219e8037c..186f20c4a45e 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1087,7 +1087,7 @@ fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm,
                 rta->rta_oif = &dev->ifindex;
                 if (colon) {
                         struct in_ifaddr *ifa;
-                        struct in_device *in_dev = __in_dev_get(dev);
+                        struct in_device *in_dev = __in_dev_get_rtnl(dev);
                         if (!in_dev)
                                 return -ENODEV;
                         *colon = ':';
@@ -1268,7 +1268,7 @@ int fib_sync_up(struct net_device *dev)
                         }
                         if (nh->nh_dev == NULL || !(nh->nh_dev->flags&IFF_UP))
                                 continue;
-                        if (nh->nh_dev != dev || __in_dev_get(dev) == NULL)
+                        if (nh->nh_dev != dev || !__in_dev_get_rtnl(dev))
                                 continue;
                         alive++;
                         spin_lock_bh(&fib_multipath_lock);
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 24eb56ae1b5a..90dca711ac9f 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -188,7 +188,7 @@ struct icmp_err icmp_err_convert[] = {
 
 /* Control parameters for ECHO replies. */
 int sysctl_icmp_echo_ignore_all;
-int sysctl_icmp_echo_ignore_broadcasts;
+int sysctl_icmp_echo_ignore_broadcasts = 1;
 
 /* Control parameter - ignore bogus broadcast responses? */
 int sysctl_icmp_ignore_bogus_error_responses;
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 70c44e4c3ceb..8b6d3939e1e6 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1323,7 +1323,7 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr)
         }
         if (dev) {
                 imr->imr_ifindex = dev->ifindex;
-                idev = __in_dev_get(dev);
+                idev = __in_dev_get_rtnl(dev);
         }
         return idev;
 }
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 4d1502a49852..f9076ef3a1a8 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -20,7 +20,7 @@ void __inet_twsk_kill(struct inet_timewait_sock *tw, struct inet_hashinfo *hashi
         struct inet_bind_hashbucket *bhead;
         struct inet_bind_bucket *tb;
         /* Unlink from established hashes. */
-        struct inet_ehash_bucket *ehead = &hashinfo->ehash[tw->tw_hashent];
+        struct inet_ehash_bucket *ehead = inet_ehash_bucket(hashinfo, tw->tw_hash);
 
         write_lock(&ehead->lock);
         if (hlist_unhashed(&tw->tw_node)) {
@@ -60,7 +60,7 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
 {
         const struct inet_sock *inet = inet_sk(sk);
         const struct inet_connection_sock *icsk = inet_csk(sk);
-        struct inet_ehash_bucket *ehead = &hashinfo->ehash[sk->sk_hashent];
+        struct inet_ehash_bucket *ehead = inet_ehash_bucket(hashinfo, sk->sk_hash);
         struct inet_bind_hashbucket *bhead;
         /* Step 1: Put TW into bind hash. Original socket stays there too.
            Note, that any socket with inet->num != 0 MUST be bound in
@@ -106,7 +106,7 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int stat
                 tw->tw_dport        = inet->dport;
                 tw->tw_family       = sk->sk_family;
                 tw->tw_reuse        = sk->sk_reuse;
-                tw->tw_hashent      = sk->sk_hashent;
+                tw->tw_hash         = sk->sk_hash;
                 tw->tw_ipv6only     = 0;
                 tw->tw_prot         = sk->sk_prot_creator;
                 atomic_set(&tw->tw_refcnt, 1);
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index f0d5740d7e22..896ce3f8f53a 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1104,10 +1104,10 @@ static int ipgre_open(struct net_device *dev)
                         return -EADDRNOTAVAIL;
                 dev = rt->u.dst.dev;
                 ip_rt_put(rt);
-                if (__in_dev_get(dev) == NULL)
+                if (__in_dev_get_rtnl(dev) == NULL)
                         return -EADDRNOTAVAIL;
                 t->mlink = dev->ifindex;
-                ip_mc_inc_group(__in_dev_get(dev), t->parms.iph.daddr);
+                ip_mc_inc_group(__in_dev_get_rtnl(dev), t->parms.iph.daddr);
         }
         return 0;
 }
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 9dbf5909f3a6..302b7eb507c9 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -149,7 +149,7 @@ struct net_device *ipmr_new_tunnel(struct vifctl *v)
                 if (err == 0 && (dev = __dev_get_by_name(p.name)) != NULL) {
                         dev->flags |= IFF_MULTICAST;
 
-                        in_dev = __in_dev_get(dev);
+                        in_dev = __in_dev_get_rtnl(dev);
                         if (in_dev == NULL && (in_dev = inetdev_init(dev)) == NULL)
                                 goto failure;
                         in_dev->cnf.rp_filter = 0;
@@ -278,7 +278,7 @@ static int vif_delete(int vifi)
 
         dev_set_allmulti(dev, -1);
 
-        if ((in_dev = __in_dev_get(dev)) != NULL) {
+        if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) {
                 in_dev->cnf.mc_forwarding--;
                 ip_rt_multicast_event(in_dev);
         }
@@ -421,7 +421,7 @@ static int vif_add(struct vifctl *vifc, int mrtsock)
                 return -EINVAL;
         }
 
-        if ((in_dev = __in_dev_get(dev)) == NULL)
+        if ((in_dev = __in_dev_get_rtnl(dev)) == NULL)
                 return -EADDRNOTAVAIL;
         in_dev->cnf.mc_forwarding++;
         dev_set_allmulti(dev, +1);
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 3cf9b451675c..2cd7e7d1ac90 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -537,6 +537,17 @@ config IP_NF_TARGET_TCPMSS
 
           To compile it as a module, choose M here.  If unsure, say N.
 
+config IP_NF_TARGET_NFQUEUE
+        tristate "NFQUEUE Target Support"
+        depends on IP_NF_IPTABLES
+        help
+          This Target replaced the old obsolete QUEUE target.
+
+          As opposed to QUEUE, it supports 65535 different queues,
+          not just one.
+
+          To compile it as a module, choose M here.  If unsure, say N.
+
 # NAT + specific targets
 config IP_NF_NAT
         tristate "Full NAT"
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 3d45d3c0283c..dab4b58dd31e 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -4,7 +4,8 @@
 
 # objects for the standalone - connection tracking / NAT
 ip_conntrack-objs       := ip_conntrack_standalone.o ip_conntrack_core.o ip_conntrack_proto_generic.o ip_conntrack_proto_tcp.o ip_conntrack_proto_udp.o ip_conntrack_proto_icmp.o
-iptable_nat-objs        := ip_nat_standalone.o ip_nat_rule.o ip_nat_core.o ip_nat_helper.o ip_nat_proto_unknown.o ip_nat_proto_tcp.o ip_nat_proto_udp.o ip_nat_proto_icmp.o
+ip_nat-objs     := ip_nat_core.o ip_nat_helper.o ip_nat_proto_unknown.o ip_nat_proto_tcp.o ip_nat_proto_udp.o ip_nat_proto_icmp.o
+iptable_nat-objs        := ip_nat_rule.o ip_nat_standalone.o
 
 ip_conntrack_pptp-objs  := ip_conntrack_helper_pptp.o ip_conntrack_proto_gre.o
 ip_nat_pptp-objs        := ip_nat_helper_pptp.o ip_nat_proto_gre.o
@@ -40,7 +41,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
 # the three instances of ip_tables
 obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o
 obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o
-obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
+obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o ip_nat.o
 obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o
 
 # matches
@@ -92,6 +93,7 @@ obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
 obj-$(CONFIG_IP_NF_TARGET_NOTRACK) += ipt_NOTRACK.o
 obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
 obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
+obj-$(CONFIG_IP_NF_TARGET_NFQUEUE) += ipt_NFQUEUE.o
 
 # generic ARP tables
 obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o
@@ -101,4 +103,3 @@ obj-$(CONFIG_IP_NF_ARP_MANGLE) += arpt_mangle.o
 obj-$(CONFIG_IP_NF_ARPFILTER) += arptable_filter.o
 
 obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
-obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += ipt_NFQUEUE.o
diff --git a/net/ipv4/netfilter/ip_conntrack_amanda.c b/net/ipv4/netfilter/ip_conntrack_amanda.c
index dc20881004bc..fa3f914117ec 100644
--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
+++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
@@ -65,7 +65,7 @@ static int help(struct sk_buff **pskb,
 
         /* increase the UDP timeout of the master connection as replies from
          * Amanda clients to the server can be quite delayed */
-        ip_ct_refresh_acct(ct, ctinfo, NULL, master_timeout * HZ);
+        ip_ct_refresh(ct, *pskb, master_timeout * HZ);
 
         /* No data? */
         dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr);
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index c1f82e0c81cf..ea65dd3e517a 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1112,45 +1112,46 @@ void ip_conntrack_helper_unregister(struct ip_conntrack_helper *me)
         synchronize_net();
 }
 
-static inline void ct_add_counters(struct ip_conntrack *ct,
-                                   enum ip_conntrack_info ctinfo,
-                                   const struct sk_buff *skb)
-{
-#ifdef CONFIG_IP_NF_CT_ACCT
-        if (skb) {
-                ct->counters[CTINFO2DIR(ctinfo)].packets++;
-                ct->counters[CTINFO2DIR(ctinfo)].bytes += 
-                                        ntohs(skb->nh.iph->tot_len);
-        }
-#endif
-}
-
-/* Refresh conntrack for this many jiffies and do accounting (if skb != NULL) */
-void ip_ct_refresh_acct(struct ip_conntrack *ct, 
+/* Refresh conntrack for this many jiffies and do accounting if do_acct is 1 */
+void __ip_ct_refresh_acct(struct ip_conntrack *ct, 
                         enum ip_conntrack_info ctinfo,
                         const struct sk_buff *skb,
-                        unsigned long extra_jiffies)
+                        unsigned long extra_jiffies,
+                        int do_acct)
 {
+        int do_event = 0;
+
         IP_NF_ASSERT(ct->timeout.data == (unsigned long)ct);
+        IP_NF_ASSERT(skb);
+
+        write_lock_bh(&ip_conntrack_lock);
 
         /* If not in hash table, timer will not be active yet */
         if (!is_confirmed(ct)) {
                 ct->timeout.expires = extra_jiffies;
-                ct_add_counters(ct, ctinfo, skb);
+                do_event = 1;
         } else {
-                write_lock_bh(&ip_conntrack_lock);
                 /* Need del_timer for race avoidance (may already be dying). */
                 if (del_timer(&ct->timeout)) {
                         ct->timeout.expires = jiffies + extra_jiffies;
                         add_timer(&ct->timeout);
-                        /* FIXME: We loose some REFRESH events if this function
-                         * is called without an skb.  I'll fix this later -HW */
-                        if (skb)
-                                ip_conntrack_event_cache(IPCT_REFRESH, skb);
+                        do_event = 1;
                 }
-                ct_add_counters(ct, ctinfo, skb);
-                write_unlock_bh(&ip_conntrack_lock);
         }
+
+#ifdef CONFIG_IP_NF_CT_ACCT
+        if (do_acct) {
+                ct->counters[CTINFO2DIR(ctinfo)].packets++;
+                ct->counters[CTINFO2DIR(ctinfo)].bytes += 
+                                                ntohs(skb->nh.iph->tot_len);
+        }
+#endif
+
+        write_unlock_bh(&ip_conntrack_lock);
+
+        /* must be unlocked when calling event cache */
+        if (do_event)
+                ip_conntrack_event_cache(IPCT_REFRESH, skb);
 }
 
 #if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
index 79db5b70d5f6..926a6684643d 100644
--- a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
@@ -172,7 +172,6 @@ static int destroy_sibling_or_exp(const struct ip_conntrack_tuple *t)
                 DEBUGP("setting timeout of conntrack %p to 0\n", sibling);
                 sibling->proto.gre.timeout = 0;
                 sibling->proto.gre.stream_timeout = 0;
-                /* refresh_acct will not modify counters if skb == NULL */
                 if (del_timer(&sibling->timeout))
                         sibling->timeout.function((unsigned long)sibling);
                 ip_conntrack_put(sibling);
@@ -223,8 +222,8 @@ static void pptp_destroy_siblings(struct ip_conntrack *ct)
 static inline int
 exp_gre(struct ip_conntrack *master,
         u_int32_t seq,
-        u_int16_t callid,
-        u_int16_t peer_callid)
+        __be16 callid,
+        __be16 peer_callid)
 {
         struct ip_conntrack_tuple inv_tuple;
         struct ip_conntrack_tuple exp_tuples[] = {
@@ -263,7 +262,7 @@ exp_gre(struct ip_conntrack *master,
         exp_orig->mask.src.ip = 0xffffffff;
         exp_orig->mask.src.u.all = 0;
         exp_orig->mask.dst.u.all = 0;
-        exp_orig->mask.dst.u.gre.key = 0xffff;
+        exp_orig->mask.dst.u.gre.key = htons(0xffff);
         exp_orig->mask.dst.ip = 0xffffffff;
         exp_orig->mask.dst.protonum = 0xff;
                 
@@ -340,7 +339,8 @@ pptp_inbound_pkt(struct sk_buff **pskb,
         unsigned int reqlen;
         union pptp_ctrl_union _pptpReq, *pptpReq;
         struct ip_ct_pptp_master *info = &ct->help.ct_pptp_info;
-        u_int16_t msg, *cid, *pcid;
+        u_int16_t msg;
+        __be16 *cid, *pcid;
         u_int32_t seq;  
 
         ctlh = skb_header_pointer(*pskb, nexthdr_off, sizeof(_ctlh), &_ctlh);
@@ -485,7 +485,7 @@ pptp_inbound_pkt(struct sk_buff **pskb,
 
                 if (info->pns_call_id != ntohs(*pcid)) {
                         DEBUGP("%s for unknown CallID %u\n", 
-                                pptp_msg_name[msg], ntohs(*cid));
+                                pptp_msg_name[msg], ntohs(*pcid));
                         break;
                 }
 
@@ -551,7 +551,8 @@ pptp_outbound_pkt(struct sk_buff **pskb,
         unsigned int reqlen;
         union pptp_ctrl_union _pptpReq, *pptpReq;
         struct ip_ct_pptp_master *info = &ct->help.ct_pptp_info;
-        u_int16_t msg, *cid, *pcid;
+        u_int16_t msg;
+        __be16 *cid, *pcid;
 
         ctlh = skb_header_pointer(*pskb, nexthdr_off, sizeof(_ctlh), &_ctlh);
         if (!ctlh)
@@ -755,7 +756,7 @@ static struct ip_conntrack_helper pptp = {
                           } 
                  },
         .mask = { .src = { .ip = 0, 
-                           .u = { .tcp = { .port = 0xffff } } 
+                           .u = { .tcp = { .port = __constant_htons(0xffff) } } 
                          }, 
                   .dst = { .ip = 0, 
                            .u = { .all = 0 },
diff --git a/net/ipv4/netfilter/ip_conntrack_netbios_ns.c b/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
index 71ef19d126d0..186646eb249f 100644
--- a/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
+++ b/net/ipv4/netfilter/ip_conntrack_netbios_ns.c
@@ -58,7 +58,7 @@ static int help(struct sk_buff **pskb,
                 goto out;
 
         rcu_read_lock();
-        in_dev = __in_dev_get(rt->u.dst.dev);
+        in_dev = __in_dev_get_rcu(rt->u.dst.dev);
         if (in_dev != NULL) {
                 for_primary_ifa(in_dev) {
                         if (ifa->ifa_broadcast == iph->daddr) {
@@ -91,7 +91,7 @@ static int help(struct sk_buff **pskb,
         ip_conntrack_expect_related(exp);
         ip_conntrack_expect_put(exp);
 
-        ip_ct_refresh_acct(ct, ctinfo, NULL, timeout * HZ);
+        ip_ct_refresh(ct, *pskb, timeout * HZ);
 out:
         return NF_ACCEPT;
 }
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_gre.c b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
index de3cb9db6f85..744abb9d377a 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -247,6 +247,7 @@ static int gre_packet(struct ip_conntrack *ct,
                                    ct->proto.gre.stream_timeout);
                 /* Also, more likely to be important, and not a probe. */
                 set_bit(IPS_ASSURED_BIT, &ct->status);
+                ip_conntrack_event_cache(IPCT_STATUS, skb);
         } else
                 ip_ct_refresh_acct(ct, conntrackinfo, skb,
                                    ct->proto.gre.timeout);
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
index a875f35e576d..59a4a0111dd3 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
@@ -416,6 +416,7 @@ static int sctp_packet(struct ip_conntrack *conntrack,
                 && newconntrack == SCTP_CONNTRACK_ESTABLISHED) {
                 DEBUGP("Setting assured bit\n");
                 set_bit(IPS_ASSURED_BIT, &conntrack->status);
+                ip_conntrack_event_cache(IPCT_STATUS, skb);
         }
 
         return NF_ACCEPT;
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index 1985abc59d24..121760d6cc50 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -1014,7 +1014,8 @@ static int tcp_packet(struct ip_conntrack *conntrack,
                 /* Set ASSURED if we see see valid ack in ESTABLISHED 
                    after SYN_RECV or a valid answer for a picked up 
                    connection. */
-                        set_bit(IPS_ASSURED_BIT, &conntrack->status);
+                set_bit(IPS_ASSURED_BIT, &conntrack->status);
+                ip_conntrack_event_cache(IPCT_STATUS, skb);
         }
         ip_ct_refresh_acct(conntrack, ctinfo, skb, timeout);
 
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index d3c7808010ec..dd476b191f4b 100644
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -989,7 +989,7 @@ EXPORT_SYMBOL(need_ip_conntrack);
 EXPORT_SYMBOL(ip_conntrack_helper_register);
 EXPORT_SYMBOL(ip_conntrack_helper_unregister);
 EXPORT_SYMBOL(ip_ct_iterate_cleanup);
-EXPORT_SYMBOL(ip_ct_refresh_acct);
+EXPORT_SYMBOL(__ip_ct_refresh_acct);
 
 EXPORT_SYMBOL(ip_conntrack_expect_alloc);
 EXPORT_SYMBOL(ip_conntrack_expect_put);
diff --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c
index c3ea891d38e7..c5e3abd24672 100644
--- a/net/ipv4/netfilter/ip_nat_core.c
+++ b/net/ipv4/netfilter/ip_nat_core.c
@@ -74,12 +74,14 @@ ip_nat_proto_find_get(u_int8_t protonum)
 
         return p;
 }
+EXPORT_SYMBOL_GPL(ip_nat_proto_find_get);
 
 void
 ip_nat_proto_put(struct ip_nat_protocol *p)
 {
         module_put(p->me);
 }
+EXPORT_SYMBOL_GPL(ip_nat_proto_put);
 
 /* We keep an extra hash for each conntrack, for fast searching. */
 static inline unsigned int
@@ -111,6 +113,7 @@ ip_nat_cheat_check(u_int32_t oldvalinv, u_int32_t newval, u_int16_t oldcheck)
         return csum_fold(csum_partial((char *)diffs, sizeof(diffs),
                                       oldcheck^0xFFFF));
 }
+EXPORT_SYMBOL(ip_nat_cheat_check);
 
 /* Is this tuple already taken? (not by us) */
 int
@@ -127,6 +130,7 @@ ip_nat_used_tuple(const struct ip_conntrack_tuple *tuple,
         invert_tuplepr(&reply, tuple);
         return ip_conntrack_tuple_taken(&reply, ignored_conntrack);
 }
+EXPORT_SYMBOL(ip_nat_used_tuple);
 
 /* If we source map this tuple so reply looks like reply_tuple, will
  * that meet the constraints of range. */
@@ -347,6 +351,7 @@ ip_nat_setup_info(struct ip_conntrack *conntrack,
 
         return NF_ACCEPT;
 }
+EXPORT_SYMBOL(ip_nat_setup_info);
 
 /* Returns true if succeeded. */
 static int
@@ -387,10 +392,10 @@ manip_pkt(u_int16_t proto,
 }
 
 /* Do packet manipulations according to ip_nat_setup_info. */
-unsigned int nat_packet(struct ip_conntrack *ct,
-                        enum ip_conntrack_info ctinfo,
-                        unsigned int hooknum,
-                        struct sk_buff **pskb)
+unsigned int ip_nat_packet(struct ip_conntrack *ct,
+                           enum ip_conntrack_info ctinfo,
+                           unsigned int hooknum,
+                           struct sk_buff **pskb)
 {
         enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
         unsigned long statusbit;
@@ -417,12 +422,13 @@ unsigned int nat_packet(struct ip_conntrack *ct,
         }
         return NF_ACCEPT;
 }
+EXPORT_SYMBOL_GPL(ip_nat_packet);
 
 /* Dir is direction ICMP is coming from (opposite to packet it contains) */
-int icmp_reply_translation(struct sk_buff **pskb,
-                           struct ip_conntrack *ct,
-                           enum ip_nat_manip_type manip,
-                           enum ip_conntrack_dir dir)
+int ip_nat_icmp_reply_translation(struct sk_buff **pskb,
+                                  struct ip_conntrack *ct,
+                                  enum ip_nat_manip_type manip,
+                                  enum ip_conntrack_dir dir)
 {
         struct {
                 struct icmphdr icmp;
@@ -509,6 +515,7 @@ int icmp_reply_translation(struct sk_buff **pskb,
 
         return 1;
 }
+EXPORT_SYMBOL_GPL(ip_nat_icmp_reply_translation);
 
 /* Protocol registration. */
 int ip_nat_protocol_register(struct ip_nat_protocol *proto)
@@ -525,6 +532,7 @@ int ip_nat_protocol_register(struct ip_nat_protocol *proto)
         write_unlock_bh(&ip_nat_lock);
         return ret;
 }
+EXPORT_SYMBOL(ip_nat_protocol_register);
 
 /* Noone stores the protocol anywhere; simply delete it. */
 void ip_nat_protocol_unregister(struct ip_nat_protocol *proto)
@@ -536,6 +544,7 @@ void ip_nat_protocol_unregister(struct ip_nat_protocol *proto)
         /* Someone could be still looking at the proto in a bh. */
         synchronize_net();
 }
+EXPORT_SYMBOL(ip_nat_protocol_unregister);
 
 #if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \
     defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)
@@ -582,7 +591,7 @@ EXPORT_SYMBOL_GPL(ip_nat_port_nfattr_to_range);
 EXPORT_SYMBOL_GPL(ip_nat_port_range_to_nfattr);
 #endif
 
-int __init ip_nat_init(void)
+static int __init ip_nat_init(void)
 {
         size_t i;
 
@@ -624,10 +633,14 @@ static int clean_nat(struct ip_conntrack *i, void *data)
         return 0;
 }
 
-/* Not __exit: called from ip_nat_standalone.c:init_or_cleanup() --RR */
-void ip_nat_cleanup(void)
+static void __exit ip_nat_cleanup(void)
 {
         ip_ct_iterate_cleanup(&clean_nat, NULL);
         ip_conntrack_destroyed = NULL;
         vfree(bysource);
 }
+
+MODULE_LICENSE("GPL");
+
+module_init(ip_nat_init);
+module_exit(ip_nat_cleanup);
diff --git a/net/ipv4/netfilter/ip_nat_helper.c b/net/ipv4/netfilter/ip_nat_helper.c
index d2dd5d313556..5d506e0564d5 100644
--- a/net/ipv4/netfilter/ip_nat_helper.c
+++ b/net/ipv4/netfilter/ip_nat_helper.c
@@ -199,6 +199,7 @@ ip_nat_mangle_tcp_packet(struct sk_buff **pskb,
         }
         return 1;
 }
+EXPORT_SYMBOL(ip_nat_mangle_tcp_packet);
                         
 /* Generic function for mangling variable-length address changes inside
  * NATed UDP connections (like the CONNECT DATA XXXXX MESG XXXXX INDEX XXXXX
@@ -256,6 +257,7 @@ ip_nat_mangle_udp_packet(struct sk_buff **pskb,
 
         return 1;
 }
+EXPORT_SYMBOL(ip_nat_mangle_udp_packet);
 
 /* Adjust one found SACK option including checksum correction */
 static void
@@ -399,6 +401,7 @@ ip_nat_seq_adjust(struct sk_buff **pskb,
 
         return 1;
 }
+EXPORT_SYMBOL(ip_nat_seq_adjust);
 
 /* Setup NAT on this expected conntrack so it follows master. */
 /* If we fail to get a free NAT slot, we'll get dropped on confirm */
@@ -425,3 +428,4 @@ void ip_nat_follow_master(struct ip_conntrack *ct,
         /* hook doesn't matter, but it has to do destination manip */
         ip_nat_setup_info(ct, &range, NF_IP_PRE_ROUTING);
 }
+EXPORT_SYMBOL(ip_nat_follow_master);
diff --git a/net/ipv4/netfilter/ip_nat_standalone.c b/net/ipv4/netfilter/ip_nat_standalone.c
index 0ff368b131f6..30cd4e18c129 100644
--- a/net/ipv4/netfilter/ip_nat_standalone.c
+++ b/net/ipv4/netfilter/ip_nat_standalone.c
@@ -108,8 +108,8 @@ ip_nat_fn(unsigned int hooknum,
         case IP_CT_RELATED:
         case IP_CT_RELATED+IP_CT_IS_REPLY:
                 if ((*pskb)->nh.iph->protocol == IPPROTO_ICMP) {
-                        if (!icmp_reply_translation(pskb, ct, maniptype,
-                                                    CTINFO2DIR(ctinfo)))
+                        if (!ip_nat_icmp_reply_translation(pskb, ct, maniptype,
+                                                           CTINFO2DIR(ctinfo)))
                                 return NF_DROP;
                         else
                                 return NF_ACCEPT;
@@ -152,7 +152,7 @@ ip_nat_fn(unsigned int hooknum,
         }
 
         IP_NF_ASSERT(info);
-        return nat_packet(ct, ctinfo, hooknum, pskb);
+        return ip_nat_packet(ct, ctinfo, hooknum, pskb);
 }
 
 static unsigned int
@@ -325,15 +325,10 @@ static int init_or_cleanup(int init)
                 printk("ip_nat_init: can't setup rules.\n");
                 goto cleanup_nothing;
         }
-        ret = ip_nat_init();
-        if (ret < 0) {
-                printk("ip_nat_init: can't setup rules.\n");
-                goto cleanup_rule_init;
-        }
         ret = nf_register_hook(&ip_nat_in_ops);
         if (ret < 0) {
                 printk("ip_nat_init: can't register in hook.\n");
-                goto cleanup_nat;
+                goto cleanup_rule_init;
         }
         ret = nf_register_hook(&ip_nat_out_ops);
         if (ret < 0) {
@@ -374,8 +369,6 @@ static int init_or_cleanup(int init)
         nf_unregister_hook(&ip_nat_out_ops);
  cleanup_inops:
         nf_unregister_hook(&ip_nat_in_ops);
- cleanup_nat:
-        ip_nat_cleanup();
  cleanup_rule_init:
         ip_nat_rule_cleanup();
  cleanup_nothing:
@@ -395,14 +388,4 @@ static void __exit fini(void)
 module_init(init);
 module_exit(fini);
 
-EXPORT_SYMBOL(ip_nat_setup_info);
-EXPORT_SYMBOL(ip_nat_protocol_register);
-EXPORT_SYMBOL(ip_nat_protocol_unregister);
-EXPORT_SYMBOL_GPL(ip_nat_proto_find_get);
-EXPORT_SYMBOL_GPL(ip_nat_proto_put);
-EXPORT_SYMBOL(ip_nat_cheat_check);
-EXPORT_SYMBOL(ip_nat_mangle_tcp_packet);
-EXPORT_SYMBOL(ip_nat_mangle_udp_packet);
-EXPORT_SYMBOL(ip_nat_used_tuple);
-EXPORT_SYMBOL(ip_nat_follow_master);
 MODULE_LICENSE("GPL");
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index d54f14d926f6..36339eb39e17 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -240,8 +240,8 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
 
         pmsg->packet_id       = (unsigned long )entry;
         pmsg->data_len        = data_len;
-        pmsg->timestamp_sec   = skb_tv_base.tv_sec + entry->skb->tstamp.off_sec;
-        pmsg->timestamp_usec  = skb_tv_base.tv_usec + entry->skb->tstamp.off_usec;
+        pmsg->timestamp_sec   = entry->skb->tstamp.off_sec;
+        pmsg->timestamp_usec  = entry->skb->tstamp.off_usec;
         pmsg->mark            = entry->skb->nfmark;
         pmsg->hook            = entry->info->hook;
         pmsg->hw_protocol     = entry->skb->protocol;
diff --git a/net/ipv4/netfilter/ipt_REDIRECT.c b/net/ipv4/netfilter/ipt_REDIRECT.c
index 715cb613405c..5245bfd33d52 100644
--- a/net/ipv4/netfilter/ipt_REDIRECT.c
+++ b/net/ipv4/netfilter/ipt_REDIRECT.c
@@ -93,7 +93,7 @@ redirect_target(struct sk_buff **pskb,
                 newdst = 0;
                 
                 rcu_read_lock();
-                indev = __in_dev_get((*pskb)->dev);
+                indev = __in_dev_get_rcu((*pskb)->dev);
                 if (indev && (ifa = indev->ifa_list))
                         newdst = ifa->ifa_local;
                 rcu_read_unlock();
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index e2c14f3cb2fc..2883ccd8a91d 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -225,8 +225,8 @@ static void ipt_ulog_packet(unsigned int hooknum,
 
         /* copy hook, prefix, timestamp, payload, etc. */
         pm->data_len = copy_len;
-        pm->timestamp_sec = skb_tv_base.tv_sec + skb->tstamp.off_sec;
-        pm->timestamp_usec = skb_tv_base.tv_usec + skb->tstamp.off_usec;
+        pm->timestamp_sec = skb->tstamp.off_sec;
+        pm->timestamp_usec = skb->tstamp.off_usec;
         pm->mark = skb->nfmark;
         pm->hook = hooknum;
         if (prefix != NULL)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 8549f26e2495..381dd6a6aebb 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2128,7 +2128,7 @@ int ip_route_input(struct sk_buff *skb, u32 daddr, u32 saddr,
                 struct in_device *in_dev;
 
                 rcu_read_lock();
-                if ((in_dev = __in_dev_get(dev)) != NULL) {
+                if ((in_dev = __in_dev_get_rcu(dev)) != NULL) {
                         int our = ip_check_mc(in_dev, daddr, saddr,
                                 skb->nh.iph->protocol);
                         if (our
@@ -2443,7 +2443,9 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
                 err = -ENODEV;
                 if (dev_out == NULL)
                         goto out;
-                if (__in_dev_get(dev_out) == NULL) {
+
+                /* RACE: Check return value of inet_select_addr instead. */
+                if (__in_dev_get_rtnl(dev_out) == NULL) {
                         dev_put(dev_out);
                         goto out;       /* Wrong error code */
                 }
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index a7537c7bbd06..677419d0c9ad 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -355,8 +355,6 @@ static void tcp_clamp_window(struct sock *sk, struct tcp_sock *tp)
                         app_win -= icsk->icsk_ack.rcv_mss;
                 app_win = max(app_win, 2U*tp->advmss);
 
-                if (!ofo_win)
-                        tp->window_clamp = min(tp->window_clamp, app_win);
                 tp->rcv_ssthresh = min(tp->window_clamp, 2U*tp->advmss);
         }
 }
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 13dfb391cdf1..c85819d8474b 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -130,19 +130,20 @@ static int __tcp_v4_check_established(struct sock *sk, __u16 lport,
         int dif = sk->sk_bound_dev_if;
         INET_ADDR_COOKIE(acookie, saddr, daddr)
         const __u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-        const int hash = inet_ehashfn(daddr, lport, saddr, inet->dport, tcp_hashinfo.ehash_size);
-        struct inet_ehash_bucket *head = &tcp_hashinfo.ehash[hash];
+        unsigned int hash = inet_ehashfn(daddr, lport, saddr, inet->dport);
+        struct inet_ehash_bucket *head = inet_ehash_bucket(&tcp_hashinfo, hash);
         struct sock *sk2;
         const struct hlist_node *node;
         struct inet_timewait_sock *tw;
 
+        prefetch(head->chain.first);
         write_lock(&head->lock);
 
         /* Check TIME-WAIT sockets first. */
         sk_for_each(sk2, node, &(head + tcp_hashinfo.ehash_size)->chain) {
                 tw = inet_twsk(sk2);
 
-                if (INET_TW_MATCH(sk2, acookie, saddr, daddr, ports, dif)) {
+                if (INET_TW_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif)) {
                         const struct tcp_timewait_sock *tcptw = tcp_twsk(sk2);
                         struct tcp_sock *tp = tcp_sk(sk);
 
@@ -179,7 +180,7 @@ static int __tcp_v4_check_established(struct sock *sk, __u16 lport,
 
         /* And established part... */
         sk_for_each(sk2, node, &head->chain) {
-                if (INET_MATCH(sk2, acookie, saddr, daddr, ports, dif))
+                if (INET_MATCH(sk2, hash, acookie, saddr, daddr, ports, dif))
                         goto not_unique;
         }
 
@@ -188,7 +189,7 @@ unique:
          * in hash table socket with a funny identity. */
         inet->num = lport;
         inet->sport = htons(lport);
-        sk->sk_hashent = hash;
+        sk->sk_hash = hash;
         BUG_TRAP(sk_unhashed(sk));
         __sk_add_node(sk, &head->chain);
         sock_prot_inc_use(sk->sk_prot);
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 5dd6dd7d091e..c5b911f9b662 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -190,7 +190,7 @@ void tcp_select_initial_window(int __space, __u32 mss,
         }
 
         /* Set initial window to value enough for senders,
-         * following RFC1414. Senders, not following this RFC,
+         * following RFC2414. Senders, not following this RFC,
          * will be satisfied with 2.
          */
         if (mss > (1<<*rcv_wscale)) {
@@ -509,7 +509,16 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
                         tp->lost_out -= diff;
                         tp->left_out -= diff;
                 }
+
                 if (diff > 0) {
+                        /* Adjust Reno SACK estimate. */
+                        if (!tp->rx_opt.sack_ok) {
+                                tp->sacked_out -= diff;
+                                if ((int)tp->sacked_out < 0)
+                                        tp->sacked_out = 0;
+                                tcp_sync_left_out(tp);
+                        }
+
                         tp->fackets_out -= diff;
                         if ((int)tp->fackets_out < 0)
                                 tp->fackets_out = 0;
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 2fea3f4402a0..a970b4727ce8 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1806,7 +1806,7 @@ static void sit_add_v4_addrs(struct inet6_dev *idev)
         }
 
         for (dev = dev_base; dev != NULL; dev = dev->next) {
-                struct in_device * in_dev = __in_dev_get(dev);
+                struct in_device * in_dev = __in_dev_get_rtnl(dev);
                 if (in_dev && (dev->flags & IFF_UP)) {
                         struct in_ifaddr * ifa;
 
@@ -3520,6 +3520,8 @@ int __init addrconf_init(void)
         if (err)
                 return err;
 
+        ip6_null_entry.rt6i_idev = in6_dev_get(&loopback_dev);
+
         register_netdevice_notifier(&ipv6_dev_notf);
 
 #ifdef CONFIG_IPV6_PRIVACY
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 2f589f24c093..563b442ffab8 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -666,7 +666,7 @@ slow_path:
                  */
                 fh->nexthdr = nexthdr;
                 fh->reserved = 0;
-                if (frag_id) {
+                if (!frag_id) {
                         ipv6_select_ident(skb, fh);
                         frag_id = fh->identification;
                 } else
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 216fbe1ac65c..bb7ccfe33f23 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -209,6 +209,17 @@ config IP6_NF_TARGET_REJECT
 
           To compile it as a module, choose M here.  If unsure, say N.
 
+config IP6_NF_TARGET_NFQUEUE
+        tristate "NFQUEUE Target Support"
+        depends on IP_NF_IPTABLES
+        help
+          This Target replaced the old obsolete QUEUE target.
+
+          As opposed to QUEUE, it supports 65535 different queues,
+          not just one.
+
+          To compile it as a module, choose M here.  If unsure, say N.
+
 #  if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then
 #    dep_tristate '    REJECT target support' CONFIG_IP6_NF_TARGET_REJECT $CONFIG_IP6_NF_FILTER
 #    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile
index bd9a16a5cbba..2b2c370e8b1c 100644
--- a/net/ipv6/netfilter/Makefile
+++ b/net/ipv6/netfilter/Makefile
@@ -21,9 +21,9 @@ obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
 obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
 obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
 obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
+obj-$(CONFIG_IP6_NF_TARGET_NFQUEUE) += ip6t_NFQUEUE.o
 obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
 obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
 obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
 obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o
-obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += ip6t_NFQUEUE.o
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index aa11cf366efa..5027bbe6415e 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -238,8 +238,8 @@ ipq_build_packet_message(struct ipq_queue_entry *entry, int *errp)
 
         pmsg->packet_id       = (unsigned long )entry;
         pmsg->data_len        = data_len;
-        pmsg->timestamp_sec   = skb_tv_base.tv_sec + entry->skb->tstamp.off_sec;
-        pmsg->timestamp_usec  = skb_tv_base.tv_usec + entry->skb->tstamp.off_usec;
+        pmsg->timestamp_sec   = entry->skb->tstamp.off_sec;
+        pmsg->timestamp_usec  = entry->skb->tstamp.off_usec;
         pmsg->mark            = entry->skb->nfmark;
         pmsg->hook            = entry->info->hook;
         pmsg->hw_protocol     = entry->skb->protocol;
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 80643e6b346b..d693cb988b78 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -209,9 +209,11 @@ static __inline__ void __tcp_v6_hash(struct sock *sk)
                 lock = &tcp_hashinfo.lhash_lock;
                 inet_listen_wlock(&tcp_hashinfo);
         } else {
-                sk->sk_hashent = inet6_sk_ehashfn(sk, tcp_hashinfo.ehash_size);
-                list = &tcp_hashinfo.ehash[sk->sk_hashent].chain;
-                lock = &tcp_hashinfo.ehash[sk->sk_hashent].lock;
+                unsigned int hash;
+                sk->sk_hash = hash = inet6_sk_ehashfn(sk);
+                hash &= (tcp_hashinfo.ehash_size - 1);
+                list = &tcp_hashinfo.ehash[hash].chain;
+                lock = &tcp_hashinfo.ehash[hash].lock;
                 write_lock(lock);
         }
 
@@ -322,13 +324,13 @@ static int __tcp_v6_check_established(struct sock *sk, const __u16 lport,
         const struct in6_addr *saddr = &np->daddr;
         const int dif = sk->sk_bound_dev_if;
         const u32 ports = INET_COMBINED_PORTS(inet->dport, lport);
-        const int hash = inet6_ehashfn(daddr, inet->num, saddr, inet->dport,
-                                       tcp_hashinfo.ehash_size);
-        struct inet_ehash_bucket *head = &tcp_hashinfo.ehash[hash];
+        unsigned int hash = inet6_ehashfn(daddr, inet->num, saddr, inet->dport);
+        struct inet_ehash_bucket *head = inet_ehash_bucket(&tcp_hashinfo, hash);
         struct sock *sk2;
         const struct hlist_node *node;
         struct inet_timewait_sock *tw;
 
+        prefetch(head->chain.first);
         write_lock(&head->lock);
 
         /* Check TIME-WAIT sockets first. */
@@ -365,14 +367,14 @@ static int __tcp_v6_check_established(struct sock *sk, const __u16 lport,
 
         /* And established part... */
         sk_for_each(sk2, node, &head->chain) {
-                if (INET6_MATCH(sk2, saddr, daddr, ports, dif))
+                if (INET6_MATCH(sk2, hash, saddr, daddr, ports, dif))
                         goto not_unique;
         }
 
 unique:
         BUG_TRAP(sk_unhashed(sk));
         __sk_add_node(sk, &head->chain);
-        sk->sk_hashent = hash;
+        sk->sk_hash = hash;
         sock_prot_inc_use(sk->sk_prot);
         write_unlock(&head->lock);
 
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 6001948600f3..e4cad11f284a 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -852,10 +852,16 @@ do_append_data:
         else if (!corkreq)
                 err = udp_v6_push_pending_frames(sk, up);
 
-        if (dst && connected)
-                ip6_dst_store(sk, dst,
-                              ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?
-                              &np->daddr : NULL);
+        if (dst) {
+                if (connected) {
+                        ip6_dst_store(sk, dst,
+                                      ipv6_addr_equal(&fl->fl6_dst, &np->daddr) ?
+                                      &np->daddr : NULL);
+                } else {
+                        dst_release(dst);
+                }
+        }
+
         if (err > 0)
                 err = np->recverr ? net_xmit_errno(err) : 0;
         release_sock(sk);
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 071cd2cefd8a..953e255d2bc8 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -310,7 +310,7 @@ void irlan_eth_send_gratuitous_arp(struct net_device *dev)
 #ifdef CONFIG_INET
         IRDA_DEBUG(4, "IrLAN: Sending gratuitous ARP\n");
         rcu_read_lock();
-        in_dev = __in_dev_get(dev);
+        in_dev = __in_dev_get_rcu(dev);
         if (in_dev == NULL)
                 goto out;
         if (in_dev->ifa_list)
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 6602d901f8b1..8aff254cb418 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -38,7 +38,7 @@
 #include <net/irda/parameters.h>
 #include <net/irda/irttp.h>
 
-static struct irttp_cb *irttp = NULL;
+static struct irttp_cb *irttp;
 
 static void __irttp_close_tsap(struct tsap_cb *self);
 
@@ -86,12 +86,9 @@ static pi_param_info_t param_info = { pi_major_call_table, 1, 0x0f, 4 };
  */
 int __init irttp_init(void)
 {
-        /* Initialize the irttp structure. */
-        if (irttp == NULL) {
-                irttp = kmalloc(sizeof(struct irttp_cb), GFP_KERNEL);
-                if (irttp == NULL)
-                        return -ENOMEM;
-        }
+        irttp = kmalloc(sizeof(struct irttp_cb), GFP_KERNEL);
+        if (irttp == NULL)
+                return -ENOMEM;
         memset(irttp, 0, sizeof(struct irttp_cb));
 
         irttp->magic = TTP_MAGIC;
@@ -100,6 +97,7 @@ int __init irttp_init(void)
         if (!irttp->tsaps) {
                 IRDA_ERROR("%s: can't allocate IrTTP hashbin!\n",
                            __FUNCTION__);
+                kfree(irttp);
                 return -ENOMEM;
         }
 
@@ -115,7 +113,6 @@ int __init irttp_init(void)
 void __exit irttp_cleanup(void) 
 {
         /* Check for main structure */
-        IRDA_ASSERT(irttp != NULL, return;);
         IRDA_ASSERT(irttp->magic == TTP_MAGIC, return;);
 
         /*
@@ -382,7 +379,6 @@ struct tsap_cb *irttp_open_tsap(__u8 stsap_sel, int credit, notify_t *notify)
         struct lsap_cb *lsap;
         notify_t ttp_notify;
 
-        IRDA_ASSERT(irttp != NULL, return NULL;);
         IRDA_ASSERT(irttp->magic == TTP_MAGIC, return NULL;);
 
         /* The IrLMP spec (IrLMP 1.1 p10) says that we have the right to
@@ -1880,8 +1876,6 @@ static int irttp_seq_open(struct inode *inode, struct file *file)
         struct seq_file *seq;
         int rc = -ENOMEM;
         struct irttp_iter_state *s;
-       
-        IRDA_ASSERT(irttp != NULL, return -EINVAL;);
 
         s = kmalloc(sizeof(*s), GFP_KERNEL);
         if (!s)
diff --git a/net/llc/Makefile b/net/llc/Makefile
index 5ebd4ed2bd42..4e260cff3c5d 100644
--- a/net/llc/Makefile
+++ b/net/llc/Makefile
@@ -22,3 +22,4 @@ llc2-y := llc_if.o llc_c_ev.o llc_c_ac.o llc_conn.o llc_c_st.o llc_pdu.o \
           llc_sap.o llc_s_ac.o llc_s_ev.o llc_s_st.o af_llc.o llc_station.o
 
 llc2-$(CONFIG_PROC_FS) += llc_proc.o
+llc2-$(CONFIG_SYSCTL)  += sysctl_net_llc.o
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 66f55e514b56..59d02cbbeb9e 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -21,6 +21,7 @@
  * See the GNU General Public License for more details.
  */
 #include <linux/config.h>
+#include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/rtnetlink.h>
@@ -37,10 +38,9 @@ static u16 llc_ui_sap_link_no_max[256];
 static struct sockaddr_llc llc_ui_addrnull;
 static struct proto_ops llc_ui_ops;
 
-static int llc_ui_wait_for_conn(struct sock *sk, int timeout);
-static int llc_ui_wait_for_disc(struct sock *sk, int timeout);
-static int llc_ui_wait_for_data(struct sock *sk, int timeout);
-static int llc_ui_wait_for_busy_core(struct sock *sk, int timeout);
+static int llc_ui_wait_for_conn(struct sock *sk, long timeout);
+static int llc_ui_wait_for_disc(struct sock *sk, long timeout);
+static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout);
 
 #if 0
 #define dprintk(args...) printk(KERN_DEBUG args)
@@ -116,12 +116,12 @@ static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock)
         struct llc_sock* llc = llc_sk(sk);
         int rc = 0;
 
-        if (llc_data_accept_state(llc->state) || llc->p_flag) {
-                int timeout = sock_sndtimeo(sk, noblock);
+        if (unlikely(llc_data_accept_state(llc->state) || llc->p_flag)) {
+                long timeout = sock_sndtimeo(sk, noblock);
 
                 rc = llc_ui_wait_for_busy_core(sk, timeout);
         }
-        if (!rc)
+        if (unlikely(!rc))
                 rc = llc_build_and_send_pkt(sk, skb);
         return rc;
 }
@@ -155,7 +155,7 @@ static int llc_ui_create(struct socket *sock, int protocol)
         struct sock *sk;
         int rc = -ESOCKTNOSUPPORT;
 
-        if (sock->type == SOCK_DGRAM || sock->type == SOCK_STREAM) {
+        if (likely(sock->type == SOCK_DGRAM || sock->type == SOCK_STREAM)) {
                 rc = -ENOMEM;
                 sk = llc_sk_alloc(PF_LLC, GFP_KERNEL, &llc_proto);
                 if (sk) {
@@ -177,7 +177,7 @@ static int llc_ui_release(struct socket *sock)
         struct sock *sk = sock->sk;
         struct llc_sock *llc;
 
-        if (!sk)
+        if (unlikely(sk == NULL))
                 goto out;
         sock_hold(sk);
         lock_sock(sk);
@@ -189,10 +189,6 @@ static int llc_ui_release(struct socket *sock)
         if (!sock_flag(sk, SOCK_ZAPPED))
                 llc_sap_remove_socket(llc->sap, sk);
         release_sock(sk);
-        if (llc->sap && hlist_empty(&llc->sap->sk_list.list)) {
-                llc_release_sockets(llc->sap);
-                llc_sap_close(llc->sap);
-        }
         if (llc->dev)
                 dev_put(llc->dev);
         sock_put(sk);
@@ -221,6 +217,7 @@ static int llc_ui_autoport(void)
                                 llc_ui_sap_last_autoport = i + 2;
                                 goto out;
                         }
+                        llc_sap_put(sap);
                 }
                 llc_ui_sap_last_autoport = LLC_SAP_DYN_START;
                 tries++;
@@ -231,20 +228,13 @@ out:
 }
 
 /**
- *      llc_ui_autobind - Bind a socket to a specific address.
- *      @sk: Socket to bind an address to.
- *      @addr: Address the user wants the socket bound to.
+ *      llc_ui_autobind - automatically bind a socket to a sap
+ *      @sock: socket to bind
+ *      @addr: address to connect to
+ *
+ *      Used by llc_ui_connect and llc_ui_sendmsg when the user hasn't
+ *      specifically used llc_ui_bind to bind to an specific address/sap
  *
- *      Bind a socket to a specific address. For llc a user is able to bind to
- *      a specific sap only or mac + sap. If the user only specifies a sap and
- *      a null dmac (all zeros) the user is attempting to bind to an entire
- *      sap. This will stop anyone else on the local system from using that
- *      sap.  If someone else has a mac + sap open the bind to null + sap will
- *      fail.
- *      If the user desires to bind to a specific mac + sap, it is possible to
- *      have multiple sap connections via multiple macs.
- *      Bind and autobind for that matter must enforce the correct sap usage
- *      otherwise all hell will break loose.
  *      Returns: 0 upon success, negative otherwise.
  */
 static int llc_ui_autobind(struct socket *sock, struct sockaddr_llc *addr)
@@ -285,11 +275,7 @@ out:
  *      @addrlen: Length of the uaddr structure.
  *
  *      Bind a socket to a specific address. For llc a user is able to bind to
- *      a specific sap only or mac + sap. If the user only specifies a sap and
- *      a null dmac (all zeros) the user is attempting to bind to an entire
- *      sap. This will stop anyone else on the local system from using that
- *      sap. If someone else has a mac + sap open the bind to null + sap will
- *      fail.
+ *      a specific sap only or mac + sap.
  *      If the user desires to bind to a specific mac + sap, it is possible to
  *      have multiple sap connections via multiple macs.
  *      Bind and autobind for that matter must enforce the correct sap usage
@@ -305,10 +291,16 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
         int rc = -EINVAL;
 
         dprintk("%s: binding %02X\n", __FUNCTION__, addr->sllc_sap);
-        if (!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr))
+        if (unlikely(!sock_flag(sk, SOCK_ZAPPED) || addrlen != sizeof(*addr)))
                 goto out;
         rc = -EAFNOSUPPORT;
-        if (addr->sllc_family != AF_LLC)
+        if (unlikely(addr->sllc_family != AF_LLC))
+                goto out;
+        rc = -ENODEV;
+        rtnl_lock();
+        llc->dev = dev_getbyhwaddr(addr->sllc_arphrd, addr->sllc_mac);
+        rtnl_unlock();
+        if (!llc->dev)
                 goto out;
         if (!addr->sllc_sap) {
                 rc = -EUSERS;
@@ -322,6 +314,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
                 rc = -EBUSY; /* some other network layer is using the sap */
                 if (!sap)
                         goto out;
+                llc_sap_hold(sap);
         } else {
                 struct llc_addr laddr, daddr;
                 struct sock *ask;
@@ -338,7 +331,7 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
                 ask = llc_lookup_established(sap, &daddr, &laddr);
                 if (ask) {
                         sock_put(ask);
-                        goto out;
+                        goto out_put;
                 }
         }
         llc->laddr.lsap = addr->sllc_sap;
@@ -348,6 +341,8 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
         llc_sap_add_socket(sap, sk);
         sock_reset_flag(sk, SOCK_ZAPPED);
         rc = 0;
+out_put:
+        llc_sap_put(sap);
 out:
         return rc;
 }
@@ -369,7 +364,7 @@ static int llc_ui_shutdown(struct socket *sock, int how)
         int rc = -ENOTCONN;
 
         lock_sock(sk);
-        if (sk->sk_state != TCP_ESTABLISHED)
+        if (unlikely(sk->sk_state != TCP_ESTABLISHED))
                 goto out;
         rc = -EINVAL;
         if (how != 2)
@@ -404,14 +399,18 @@ static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,
         struct sock *sk = sock->sk;
         struct llc_sock *llc = llc_sk(sk);
         struct sockaddr_llc *addr = (struct sockaddr_llc *)uaddr;
-        struct net_device *dev;
         int rc = -EINVAL;
 
         lock_sock(sk);
-        if (addrlen != sizeof(*addr))
+        if (unlikely(addrlen != sizeof(*addr)))
                 goto out;
         rc = -EAFNOSUPPORT;
-        if (addr->sllc_family != AF_LLC)
+        if (unlikely(addr->sllc_family != AF_LLC))
+                goto out;
+        if (unlikely(sk->sk_type != SOCK_STREAM))
+                goto out;
+        rc = -EALREADY;
+        if (unlikely(sock->state == SS_CONNECTING))
                 goto out;
         /* bind connection to sap if user hasn't done it. */
         if (sock_flag(sk, SOCK_ZAPPED)) {
@@ -419,19 +418,13 @@ static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,
                 rc = llc_ui_autobind(sock, addr);
                 if (rc)
                         goto out;
-                llc->daddr.lsap = addr->sllc_sap;
-                memcpy(llc->daddr.mac, addr->sllc_mac, IFHWADDRLEN);
         }
-        dev = llc->dev;
-        if (sk->sk_type != SOCK_STREAM)
-                goto out;
-        rc = -EALREADY;
-        if (sock->state == SS_CONNECTING)
-                goto out;
+        llc->daddr.lsap = addr->sllc_sap;
+        memcpy(llc->daddr.mac, addr->sllc_mac, IFHWADDRLEN);
         sock->state = SS_CONNECTING;
         sk->sk_state   = TCP_SYN_SENT;
         llc->link   = llc_ui_next_link_no(llc->sap->laddr.lsap);
-        rc = llc_establish_connection(sk, dev->dev_addr,
+        rc = llc_establish_connection(sk, llc->dev->dev_addr,
                                       addr->sllc_mac, addr->sllc_sap);
         if (rc) {
                 dprintk("%s: llc_ui_send_conn failed :-(\n", __FUNCTION__);
@@ -439,12 +432,30 @@ static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,
                 sk->sk_state = TCP_CLOSE;
                 goto out;
         }
-        rc = llc_ui_wait_for_conn(sk, sk->sk_rcvtimeo);
-        if (rc)
-                dprintk("%s: llc_ui_wait_for_conn failed=%d\n", __FUNCTION__, rc);
+
+        if (sk->sk_state == TCP_SYN_SENT) {
+                const long timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);
+
+                if (!timeo || !llc_ui_wait_for_conn(sk, timeo))
+                        goto out;
+
+                rc = sock_intr_errno(timeo);
+                if (signal_pending(current))
+                        goto out;
+        }
+
+        if (sk->sk_state == TCP_CLOSE)
+                goto sock_error;
+
+        sock->state = SS_CONNECTED;
+        rc = 0;
 out:
         release_sock(sk);
         return rc;
+sock_error:
+        rc = sock_error(sk) ? : -ECONNABORTED;
+        sock->state = SS_UNCONNECTED;
+        goto out;
 }
 
 /**
@@ -461,10 +472,10 @@ static int llc_ui_listen(struct socket *sock, int backlog)
         int rc = -EINVAL;
 
         lock_sock(sk);
-        if (sock->state != SS_UNCONNECTED)
+        if (unlikely(sock->state != SS_UNCONNECTED))
                 goto out;
         rc = -EOPNOTSUPP;
-        if (sk->sk_type != SOCK_STREAM)
+        if (unlikely(sk->sk_type != SOCK_STREAM))
                 goto out;
         rc = -EAGAIN;
         if (sock_flag(sk, SOCK_ZAPPED))
@@ -483,20 +494,14 @@ out:
         return rc;
 }
 
-static int llc_ui_wait_for_disc(struct sock *sk, int timeout)
+static int llc_ui_wait_for_disc(struct sock *sk, long timeout)
 {
-        DECLARE_WAITQUEUE(wait, current);
-        int rc;
+        DEFINE_WAIT(wait);
+        int rc = 0;
 
-        add_wait_queue_exclusive(sk->sk_sleep, &wait);
-        for (;;) {
-                __set_current_state(TASK_INTERRUPTIBLE);
-                rc = 0;
-                if (sk->sk_state != TCP_CLOSE) {
-                        release_sock(sk);
-                        timeout = schedule_timeout(timeout);
-                        lock_sock(sk);
-                } else
+        while (1) {
+                prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
+                if (sk_wait_event(sk, &timeout, sk->sk_state == TCP_CLOSE))
                         break;
                 rc = -ERESTARTSYS;
                 if (signal_pending(current))
@@ -504,65 +509,40 @@ static int llc_ui_wait_for_disc(struct sock *sk, int timeout)
                 rc = -EAGAIN;
                 if (!timeout)
                         break;
+                rc = 0;
         }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(sk->sk_sleep, &wait);
+        finish_wait(sk->sk_sleep, &wait);
         return rc;
 }
 
-static int llc_ui_wait_for_conn(struct sock *sk, int timeout)
+static int llc_ui_wait_for_conn(struct sock *sk, long timeout)
 {
-        DECLARE_WAITQUEUE(wait, current);
-        int rc;
+        DEFINE_WAIT(wait);
 
-        add_wait_queue_exclusive(sk->sk_sleep, &wait);
-        for (;;) {
-                __set_current_state(TASK_INTERRUPTIBLE);
-                rc = -EAGAIN;
-                if (sk->sk_state == TCP_CLOSE)
-                        break;
-                rc = 0;
-                if (sk->sk_state != TCP_ESTABLISHED) {
-                        release_sock(sk);
-                        timeout = schedule_timeout(timeout);
-                        lock_sock(sk);
-                } else
+        while (1) {
+                prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
+                if (sk_wait_event(sk, &timeout, sk->sk_state != TCP_SYN_SENT))
                         break;
-                rc = -ERESTARTSYS;
-                if (signal_pending(current))
-                        break;
-                rc = -EAGAIN;
-                if (!timeout)
+                if (signal_pending(current) || !timeout)
                         break;
         }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(sk->sk_sleep, &wait);
-        return rc;
+        finish_wait(sk->sk_sleep, &wait);
+        return timeout;
 }
 
-static int llc_ui_wait_for_data(struct sock *sk, int timeout)
+static int llc_ui_wait_for_busy_core(struct sock *sk, long timeout)
 {
-        DECLARE_WAITQUEUE(wait, current);
-        int rc = 0;
+        DEFINE_WAIT(wait);
+        struct llc_sock *llc = llc_sk(sk);
+        int rc;
 
-        add_wait_queue_exclusive(sk->sk_sleep, &wait);
-        for (;;) {
-                __set_current_state(TASK_INTERRUPTIBLE);
-                if (sk->sk_shutdown & RCV_SHUTDOWN)
-                        break;
-                /*
-                 * Well, if we have backlog, try to process it now.
-                 */
-                if (sk->sk_backlog.tail) {
-                        release_sock(sk);
-                        lock_sock(sk);
-                }
+        while (1) {
+                prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
                 rc = 0;
-                if (skb_queue_empty(&sk->sk_receive_queue)) {
-                        release_sock(sk);
-                        timeout = schedule_timeout(timeout);
-                        lock_sock(sk);
-                } else
+                if (sk_wait_event(sk, &timeout,
+                                  (sk->sk_shutdown & RCV_SHUTDOWN) ||
+                                  (!llc_data_accept_state(llc->state) &&
+                                   !llc->p_flag)))
                         break;
                 rc = -ERESTARTSYS;
                 if (signal_pending(current))
@@ -571,40 +551,35 @@ static int llc_ui_wait_for_data(struct sock *sk, int timeout)
                 if (!timeout)
                         break;
         }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(sk->sk_sleep, &wait);
+        finish_wait(sk->sk_sleep, &wait);
         return rc;
 }
 
-static int llc_ui_wait_for_busy_core(struct sock *sk, int timeout)
+static int llc_wait_data(struct sock *sk, long timeo)
 {
-        DECLARE_WAITQUEUE(wait, current);
-        struct llc_sock *llc = llc_sk(sk);
         int rc;
 
-        add_wait_queue_exclusive(sk->sk_sleep, &wait);
-        for (;;) {
-                dprintk("%s: looping...\n", __FUNCTION__);
-                __set_current_state(TASK_INTERRUPTIBLE);
-                rc = -ENOTCONN;
-                if (sk->sk_shutdown & RCV_SHUTDOWN)
+        while (1) {
+                /*
+                 * POSIX 1003.1g mandates this order.
+                 */
+                if (sk->sk_err) {
+                        rc = sock_error(sk);
                         break;
+                }
                 rc = 0;
-                if (llc_data_accept_state(llc->state) || llc->p_flag) {
-                        release_sock(sk);
-                        timeout = schedule_timeout(timeout);
-                        lock_sock(sk);
-                } else
+                if (sk->sk_shutdown & RCV_SHUTDOWN)
                         break;
-                rc = -ERESTARTSYS;
+                rc = -EAGAIN;
+                if (!timeo)
+                        break;
+                rc = sock_intr_errno(timeo);
                 if (signal_pending(current))
                         break;
-                rc = -EAGAIN;
-                if (!timeout)
+                rc = 0;
+                if (sk_wait_data(sk, &timeo))
                         break;
         }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(sk->sk_sleep, &wait);
         return rc;
 }
 
@@ -627,15 +602,18 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
         dprintk("%s: accepting on %02X\n", __FUNCTION__,
                 llc_sk(sk)->laddr.lsap);
         lock_sock(sk);
-        if (sk->sk_type != SOCK_STREAM)
+        if (unlikely(sk->sk_type != SOCK_STREAM))
                 goto out;
         rc = -EINVAL;
-        if (sock->state != SS_UNCONNECTED || sk->sk_state != TCP_LISTEN)
+        if (unlikely(sock->state != SS_UNCONNECTED ||
+                     sk->sk_state != TCP_LISTEN))
                 goto out;
         /* wait for a connection to arrive. */
-        rc = llc_ui_wait_for_data(sk, sk->sk_rcvtimeo);
-        if (rc)
-                goto out;
+        if (skb_queue_empty(&sk->sk_receive_queue)) {
+                rc = llc_wait_data(sk, sk->sk_rcvtimeo);
+                if (rc)
+                        goto out;
+        }
         dprintk("%s: got a new connection on %02X\n", __FUNCTION__,
                 llc_sk(sk)->laddr.lsap);
         skb = skb_dequeue(&sk->sk_receive_queue);
@@ -657,7 +635,6 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, int flags)
         /* put original socket back into a clean listen state. */
         sk->sk_state = TCP_LISTEN;
         sk->sk_ack_backlog--;
-        skb->sk = NULL;
         dprintk("%s: ok success on %02X, client on %02X\n", __FUNCTION__,
                 llc_sk(sk)->addr.sllc_sap, newllc->daddr.lsap);
 frees:
@@ -671,56 +648,167 @@ out:
  *      llc_ui_recvmsg - copy received data to the socket user.
  *      @sock: Socket to copy data from.
  *      @msg: Various user space related information.
- *      @size: Size of user buffer.
+ *      @len: Size of user buffer.
  *      @flags: User specified flags.
  *
  *      Copy received data to the socket user.
  *      Returns non-negative upon success, negative otherwise.
  */
 static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
-                          struct msghdr *msg, size_t size, int flags)
+                          struct msghdr *msg, size_t len, int flags)
 {
-        struct sock *sk = sock->sk;
         struct sockaddr_llc *uaddr = (struct sockaddr_llc *)msg->msg_name;
-        struct sk_buff *skb;
+        const int nonblock = flags & MSG_DONTWAIT;
+        struct sk_buff *skb = NULL;
+        struct sock *sk = sock->sk;
+        struct llc_sock *llc = llc_sk(sk);
         size_t copied = 0;
-        int rc = -ENOMEM, timeout;
-        int noblock = flags & MSG_DONTWAIT;
+        u32 peek_seq = 0;
+        u32 *seq;
+        unsigned long used;
+        int target;     /* Read at least this many bytes */
+        long timeo;
 
-        dprintk("%s: receiving in %02X from %02X\n", __FUNCTION__,
-                llc_sk(sk)->laddr.lsap, llc_sk(sk)->daddr.lsap);
         lock_sock(sk);
-        timeout = sock_rcvtimeo(sk, noblock);
-        rc = llc_ui_wait_for_data(sk, timeout);
-        if (rc) {
-                dprintk("%s: llc_ui_wait_for_data failed recv "
-                        "in %02X from %02X\n", __FUNCTION__,
-                        llc_sk(sk)->laddr.lsap, llc_sk(sk)->daddr.lsap);
+        copied = -ENOTCONN;
+        if (sk->sk_state == TCP_LISTEN)
                 goto out;
-        }
-        skb = skb_dequeue(&sk->sk_receive_queue);
-        if (!skb) /* shutdown */
-                goto out;
-        copied = skb->len;
-        if (copied > size)
-                copied = size;
-        rc = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
-        if (rc)
-                goto dgram_free;
-        if (skb->len > copied) {
-                skb_pull(skb, copied);
-                skb_queue_head(&sk->sk_receive_queue, skb);
-        }
-        if (uaddr)
-                memcpy(uaddr, llc_ui_skb_cb(skb), sizeof(*uaddr));
-        msg->msg_namelen = sizeof(*uaddr);
-        if (!skb->next) {
-dgram_free:
-                kfree_skb(skb);
-        }
+
+        timeo = sock_rcvtimeo(sk, nonblock);
+
+        seq = &llc->copied_seq;
+        if (flags & MSG_PEEK) {
+                peek_seq = llc->copied_seq;
+                seq = &peek_seq;
+        }
+
+        target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
+        copied = 0;
+
+        do {
+                u32 offset;
+
+                /*
+                 * We need to check signals first, to get correct SIGURG
+                 * handling. FIXME: Need to check this doesn't impact 1003.1g
+                 * and move it down to the bottom of the loop
+                 */
+                if (signal_pending(current)) {
+                        if (copied)
+                                break;
+                        copied = timeo ? sock_intr_errno(timeo) : -EAGAIN;
+                        break;
+                }
+
+                /* Next get a buffer. */
+
+                skb = skb_peek(&sk->sk_receive_queue);
+                if (skb) {
+                        offset = *seq;
+                        goto found_ok_skb;
+                }
+                /* Well, if we have backlog, try to process it now yet. */
+
+                if (copied >= target && !sk->sk_backlog.tail)
+                        break;
+
+                if (copied) {
+                        if (sk->sk_err ||
+                            sk->sk_state == TCP_CLOSE ||
+                            (sk->sk_shutdown & RCV_SHUTDOWN) ||
+                            !timeo ||
+                            (flags & MSG_PEEK))
+                                break;
+                } else {
+                        if (sock_flag(sk, SOCK_DONE))
+                                break;
+
+                        if (sk->sk_err) {
+                                copied = sock_error(sk);
+                                break;
+                        }
+                        if (sk->sk_shutdown & RCV_SHUTDOWN)
+                                break;
+
+                        if (sk->sk_state == TCP_CLOSE) {
+                                if (!sock_flag(sk, SOCK_DONE)) {
+                                        /*
+                                         * This occurs when user tries to read
+                                         * from never connected socket.
+                                         */
+                                        copied = -ENOTCONN;
+                                        break;
+                                }
+                                break;
+                        }
+                        if (!timeo) {
+                                copied = -EAGAIN;
+                                break;
+                        }
+                }
+
+                if (copied >= target) { /* Do not sleep, just process backlog. */
+                        release_sock(sk);
+                        lock_sock(sk);
+                } else
+                        sk_wait_data(sk, &timeo);
+
+                if ((flags & MSG_PEEK) && peek_seq != llc->copied_seq) {
+                        if (net_ratelimit())
+                                printk(KERN_DEBUG "LLC(%s:%d): Application "
+                                                  "bug, race in MSG_PEEK.\n",
+                                       current->comm, current->pid);
+                        peek_seq = llc->copied_seq;
+                }
+                continue;
+        found_ok_skb:
+                /* Ok so how much can we use? */
+                used = skb->len - offset;
+                if (len < used)
+                        used = len;
+
+                if (!(flags & MSG_TRUNC)) {
+                        int rc = skb_copy_datagram_iovec(skb, offset,
+                                                         msg->msg_iov, used);
+                        if (rc) {
+                                /* Exception. Bailout! */
+                                if (!copied)
+                                        copied = -EFAULT;
+                                break;
+                        }
+                }
+
+                *seq += used;
+                copied += used;
+                len -= used;
+
+                if (used + offset < skb->len)
+                        continue;
+
+                if (!(flags & MSG_PEEK)) {
+                        sk_eat_skb(sk, skb);
+                        *seq = 0;
+                }
+        } while (len > 0);
+
+        /* 
+         * According to UNIX98, msg_name/msg_namelen are ignored
+         * on connected socket. -ANK
+         * But... af_llc still doesn't have separate sets of methods for
+         * SOCK_DGRAM and SOCK_STREAM :-( So we have to do this test, will
+         * eventually fix this tho :-) -acme
+         */
+        if (sk->sk_type == SOCK_DGRAM)
+                goto copy_uaddr;
 out:
         release_sock(sk);
-        return rc ? : copied;
+        return copied;
+copy_uaddr:
+        if (uaddr != NULL && skb != NULL) {
+                memcpy(uaddr, llc_ui_skb_cb(skb), sizeof(*uaddr));
+                msg->msg_namelen = sizeof(*uaddr);
+        }
+        goto out;
 }
 
 /**
@@ -740,7 +828,6 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock,
         struct sockaddr_llc *addr = (struct sockaddr_llc *)msg->msg_name;
         int flags = msg->msg_flags;
         int noblock = flags & MSG_DONTWAIT;
-        struct net_device *dev;
         struct sk_buff *skb;
         size_t size = 0;
         int rc = -EINVAL, copied = 0, hdrlen;
@@ -763,19 +850,17 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock,
                 if (rc)
                         goto release;
         }
-        dev = llc->dev;
-        hdrlen = dev->hard_header_len + llc_ui_header_len(sk, addr);
+        hdrlen = llc->dev->hard_header_len + llc_ui_header_len(sk, addr);
         size = hdrlen + len;
-        if (size > dev->mtu)
-                size = dev->mtu;
+        if (size > llc->dev->mtu)
+                size = llc->dev->mtu;
         copied = size - hdrlen;
         release_sock(sk);
         skb = sock_alloc_send_skb(sk, size, noblock, &rc);
         lock_sock(sk);
         if (!skb)
                 goto release;
-        skb->sk       = sk;
-        skb->dev      = dev;
+        skb->dev      = llc->dev;
         skb->protocol = llc_proto_type(addr->sllc_arphrd);
         skb_reserve(skb, hdrlen); 
         rc = memcpy_fromiovec(skb_put(skb, copied), msg->msg_iov, copied);
@@ -800,15 +885,13 @@ static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock,
         if (!(sk->sk_type == SOCK_STREAM && !addr->sllc_ua))
                 goto out;
         rc = llc_ui_send_data(sk, skb, noblock);
-        if (rc)
-                dprintk("%s: llc_ui_send_data failed: %d\n", __FUNCTION__, rc);
 out:
-        if (rc)
+        if (rc) {
                 kfree_skb(skb);
 release:
-        if (rc)
                 dprintk("%s: failed sending from %02X to %02X: %d\n",
                         __FUNCTION__, llc->laddr.lsap, llc->daddr.lsap, rc);
+        }
         release_sock(sk);
         return rc ? : copied;
 }
@@ -895,7 +978,7 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
         int rc = -EINVAL, opt;
 
         lock_sock(sk);
-        if (level != SOL_LLC || optlen != sizeof(int))
+        if (unlikely(level != SOL_LLC || optlen != sizeof(int)))
                 goto out;
         rc = get_user(opt, (int __user *)optval);
         if (rc)
@@ -915,22 +998,22 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
         case LLC_OPT_ACK_TMR_EXP:
                 if (opt > LLC_OPT_MAX_ACK_TMR_EXP)
                         goto out;
-                llc->ack_timer.expire = opt;
+                llc->ack_timer.expire = opt * HZ;
                 break;
         case LLC_OPT_P_TMR_EXP:
                 if (opt > LLC_OPT_MAX_P_TMR_EXP)
                         goto out;
-                llc->pf_cycle_timer.expire = opt;
+                llc->pf_cycle_timer.expire = opt * HZ;
                 break;
         case LLC_OPT_REJ_TMR_EXP:
                 if (opt > LLC_OPT_MAX_REJ_TMR_EXP)
                         goto out;
-                llc->rej_sent_timer.expire = opt;
+                llc->rej_sent_timer.expire = opt * HZ;
                 break;
         case LLC_OPT_BUSY_TMR_EXP:
                 if (opt > LLC_OPT_MAX_BUSY_TMR_EXP)
                         goto out;
-                llc->busy_state_timer.expire = opt;
+                llc->busy_state_timer.expire = opt * HZ;
                 break;
         case LLC_OPT_TX_WIN:
                 if (opt > LLC_OPT_MAX_WIN)
@@ -970,7 +1053,7 @@ static int llc_ui_getsockopt(struct socket *sock, int level, int optname,
         int val = 0, len = 0, rc = -EINVAL;
 
         lock_sock(sk);
-        if (level != SOL_LLC)
+        if (unlikely(level != SOL_LLC))
                 goto out;
         rc = get_user(len, optlen);
         if (rc)
@@ -980,17 +1063,17 @@ static int llc_ui_getsockopt(struct socket *sock, int level, int optname,
                 goto out;
         switch (optname) {
         case LLC_OPT_RETRY:
-                val = llc->n2;                          break;
+                val = llc->n2;                                  break;
         case LLC_OPT_SIZE:
-                val = llc->n1;                          break;
+                val = llc->n1;                                  break;
         case LLC_OPT_ACK_TMR_EXP:
-                val = llc->ack_timer.expire;            break;
+                val = llc->ack_timer.expire / HZ;               break;
         case LLC_OPT_P_TMR_EXP:
-                val = llc->pf_cycle_timer.expire;       break;
+                val = llc->pf_cycle_timer.expire / HZ;          break;
         case LLC_OPT_REJ_TMR_EXP:
-                val = llc->rej_sent_timer.expire;       break;
+                val = llc->rej_sent_timer.expire / HZ;          break;
         case LLC_OPT_BUSY_TMR_EXP:
-                val = llc->busy_state_timer.expire;     break;
+                val = llc->busy_state_timer.expire / HZ;        break;
         case LLC_OPT_TX_WIN:
                 val = llc->k;                           break;
         case LLC_OPT_RX_WIN:
@@ -1034,8 +1117,12 @@ static struct proto_ops llc_ui_ops = {
         .sendpage    = sock_no_sendpage,
 };
 
-extern void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb);
-extern void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb);
+static char llc_proc_err_msg[] __initdata =
+        KERN_CRIT "LLC: Unable to register the proc_fs entries\n";
+static char llc_sysctl_err_msg[] __initdata =
+        KERN_CRIT "LLC: Unable to register the sysctl entries\n";
+static char llc_sock_err_msg[] __initdata =
+        KERN_CRIT "LLC: Unable to register the network family\n";
 
 static int __init llc2_init(void)
 {
@@ -1048,13 +1135,28 @@ static int __init llc2_init(void)
         llc_station_init();
         llc_ui_sap_last_autoport = LLC_SAP_DYN_START;
         rc = llc_proc_init();
-        if (rc != 0)
+        if (rc != 0) {
+                printk(llc_proc_err_msg);
                 goto out_unregister_llc_proto;
-        sock_register(&llc_ui_family_ops);
+        }
+        rc = llc_sysctl_init();
+        if (rc) {
+                printk(llc_sysctl_err_msg);
+                goto out_proc;
+        }
+        rc = sock_register(&llc_ui_family_ops);
+        if (rc) {
+                printk(llc_sock_err_msg);
+                goto out_sysctl;
+        }
         llc_add_pack(LLC_DEST_SAP, llc_sap_handler);
         llc_add_pack(LLC_DEST_CONN, llc_conn_handler);
 out:
         return rc;
+out_sysctl:
+        llc_sysctl_exit();
+out_proc:
+        llc_proc_exit();
 out_unregister_llc_proto:
         proto_unregister(&llc_proto);
         goto out;
@@ -1067,6 +1169,7 @@ static void __exit llc2_exit(void)
         llc_remove_pack(LLC_DEST_CONN);
         sock_unregister(PF_LLC);
         llc_proc_exit();
+        llc_sysctl_exit();
         proto_unregister(&llc_proto);
 }
 
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c
index b218be4c10ec..b0bcfb1f12dd 100644
--- a/net/llc/llc_c_ac.c
+++ b/net/llc/llc_c_ac.c
@@ -60,23 +60,10 @@ int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb)
 {
-        int rc = -ENOTCONN;
-        u8 dsap;
-        struct llc_sap *sap;
-
-        llc_pdu_decode_dsap(skb, &dsap);
-        sap = llc_sap_find(dsap);
-        if (sap) {
-                struct llc_conn_state_ev *ev = llc_conn_ev(skb);
-                struct llc_sock *llc = llc_sk(sk);
+        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
-                llc_pdu_decode_sa(skb, llc->daddr.mac);
-                llc_pdu_decode_da(skb, llc->laddr.mac);
-                llc->dev = skb->dev;
-                ev->ind_prim = LLC_CONN_PRIM;
-                rc = 0;
-        }
-        return rc;
+        ev->ind_prim = LLC_CONN_PRIM;
+        return 0;
 }
 
 int llc_conn_ac_conn_confirm(struct sock *sk, struct sk_buff *skb)
@@ -120,10 +107,8 @@ int llc_conn_ac_disc_ind(struct sock *sk, struct sk_buff *skb)
                         reason = LLC_DISC_REASON_RX_DISC_CMD_PDU;
         } else if (ev->type == LLC_CONN_EV_TYPE_ACK_TMR)
                 reason = LLC_DISC_REASON_ACK_TMR_EXP;
-        else {
-                reason = 0;
+        else
                 rc = -EINVAL;
-        }
         if (!rc) {
                 ev->reason   = reason;
                 ev->ind_prim = LLC_DISC_PRIM;
@@ -160,9 +145,6 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb)
                            LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_SABME) {
                         reason = LLC_RESET_REASON_REMOTE;
                         rc = 0;
-                } else {
-                        reason = 0;
-                        rc  = 1;
                 }
                 break;
         case LLC_CONN_EV_TYPE_ACK_TMR:
@@ -172,8 +154,7 @@ int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb)
                 if (llc->retry_count > llc->n2) {
                         reason = LLC_RESET_REASON_LOCAL;
                         rc = 0;
-                } else
-                        rc = 1;
+                }
                 break;
         }
         if (!rc) {
@@ -217,18 +198,17 @@ int llc_conn_ac_stop_rej_tmr_if_data_flag_eq_2(struct sock *sk,
 int llc_conn_ac_send_disc_cmd_p_set_x(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_CMD);
                 llc_pdu_init_as_disc_cmd(nskb, 1);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
                 llc_conn_ac_set_p_flag_1(sk, skb);
@@ -243,20 +223,19 @@ free:
 int llc_conn_ac_send_dm_rsp_f_set_p(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
                 u8 f_bit;
 
-                nskb->dev = llc->dev;
                 llc_pdu_decode_pf_bit(skb, &f_bit);
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_dm_rsp(nskb, f_bit);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -270,19 +249,17 @@ free:
 int llc_conn_ac_send_dm_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
-                u8 f_bit = 1;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
-                llc_pdu_init_as_dm_rsp(nskb, f_bit);
+                llc_pdu_init_as_dm_rsp(nskb, 1);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -306,17 +283,16 @@ int llc_conn_ac_send_frmr_rsp_f_set_x(struct sock *sk, struct sk_buff *skb)
                 llc_pdu_decode_pf_bit(skb, &f_bit);
         else
                 f_bit = 0;
-        nskb = llc_alloc_frame();
+        nskb = llc_alloc_frame(sk, llc->dev);
         if (nskb) {
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_frmr_rsp(nskb, pdu, f_bit, llc->vS,
                                          llc->vR, INCORRECT);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -330,21 +306,19 @@ free:
 int llc_conn_ac_resend_frmr_rsp_f_set_0(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                u8 f_bit = 0;
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
                 struct llc_pdu_sn *pdu = (struct llc_pdu_sn *)&llc->rx_pdu_hdr;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
-                llc_pdu_init_as_frmr_rsp(nskb, pdu, f_bit, llc->vS,
+                llc_pdu_init_as_frmr_rsp(nskb, pdu, 0, llc->vS,
                                          llc->vR, INCORRECT);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -360,21 +334,20 @@ int llc_conn_ac_resend_frmr_rsp_f_set_p(struct sock *sk, struct sk_buff *skb)
         u8 f_bit;
         int rc = -ENOBUFS;
         struct sk_buff *nskb;
+        struct llc_sock *llc = llc_sk(sk);
 
         llc_pdu_decode_pf_bit(skb, &f_bit);
-        nskb = llc_alloc_frame();
+        nskb = llc_alloc_frame(sk, llc->dev);
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
                 struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_frmr_rsp(nskb, pdu, f_bit, llc->vS,
                                          llc->vR, INCORRECT);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -395,7 +368,7 @@ int llc_conn_ac_send_i_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
                             llc->daddr.lsap, LLC_PDU_CMD);
         llc_pdu_init_as_i_cmd(skb, 1, llc->vS, llc->vR);
         rc = llc_mac_hdr_init(skb, llc->dev->dev_addr, llc->daddr.mac);
-        if (!rc) {
+        if (likely(!rc)) {
                 llc_conn_send_pdu(sk, skb);
                 llc_conn_ac_inc_vs_by_1(sk, skb);
         }
@@ -412,7 +385,7 @@ static int llc_conn_ac_send_i_cmd_p_set_0(struct sock *sk, struct sk_buff *skb)
                             llc->daddr.lsap, LLC_PDU_CMD);
         llc_pdu_init_as_i_cmd(skb, 0, llc->vS, llc->vR);
         rc = llc_mac_hdr_init(skb, llc->dev->dev_addr, llc->daddr.mac);
-        if (!rc) {
+        if (likely(!rc)) {
                 llc_conn_send_pdu(sk, skb);
                 llc_conn_ac_inc_vs_by_1(sk, skb);
         }
@@ -429,7 +402,7 @@ int llc_conn_ac_send_i_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
                             llc->daddr.lsap, LLC_PDU_CMD);
         llc_pdu_init_as_i_cmd(skb, 0, llc->vS, llc->vR);
         rc = llc_mac_hdr_init(skb, llc->dev->dev_addr, llc->daddr.mac);
-        if (!rc) {
+        if (likely(!rc)) {
                 llc_conn_send_pdu(sk, skb);
                 llc_conn_ac_inc_vs_by_1(sk, skb);
         }
@@ -451,18 +424,17 @@ int llc_conn_ac_resend_i_xxx_x_set_0_or_send_rr(struct sock *sk,
         u8 nr;
         struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_rr_rsp(nskb, 0, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (!rc)
+                if (likely(!rc))
                         llc_conn_send_pdu(sk, nskb);
                 else
                         kfree_skb(skb);
@@ -487,18 +459,17 @@ int llc_conn_ac_resend_i_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ac_send_rej_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_CMD);
                 llc_pdu_init_as_rej_cmd(nskb, 1, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -512,19 +483,17 @@ free:
 int llc_conn_ac_send_rej_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                u8 f_bit = 1;
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
-                llc_pdu_init_as_rej_rsp(nskb, f_bit, llc->vR);
+                llc_pdu_init_as_rej_rsp(nskb, 1, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -538,19 +507,17 @@ free:
 int llc_conn_ac_send_rej_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
-                u8 f_bit = 0;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
-                llc_pdu_init_as_rej_rsp(nskb, f_bit, llc->vR);
+                llc_pdu_init_as_rej_rsp(nskb, 0, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -564,18 +531,17 @@ free:
 int llc_conn_ac_send_rnr_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_CMD);
                 llc_pdu_init_as_rnr_cmd(nskb, 1, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -589,19 +555,17 @@ free:
 int llc_conn_ac_send_rnr_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
-                u8 f_bit = 1;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
-                llc_pdu_init_as_rnr_rsp(nskb, f_bit, llc->vR);
+                llc_pdu_init_as_rnr_rsp(nskb, 1, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -615,19 +579,17 @@ free:
 int llc_conn_ac_send_rnr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                u8 f_bit = 0;
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
-                llc_pdu_init_as_rnr_rsp(nskb, f_bit, llc->vR);
+                llc_pdu_init_as_rnr_rsp(nskb, 0, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -645,7 +607,7 @@ int llc_conn_ac_set_remote_busy(struct sock *sk, struct sk_buff *skb)
         if (!llc->remote_busy_flag) {
                 llc->remote_busy_flag = 1;
                 mod_timer(&llc->busy_state_timer.timer,
-                         jiffies + llc->busy_state_timer.expire * HZ);
+                         jiffies + llc->busy_state_timer.expire);
         }
         return 0;
 }
@@ -653,18 +615,17 @@ int llc_conn_ac_set_remote_busy(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ac_opt_send_rnr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_rnr_rsp(nskb, 0, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -678,18 +639,17 @@ free:
 int llc_conn_ac_send_rr_cmd_p_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_CMD);
                 llc_pdu_init_as_rr_cmd(nskb, 1, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -703,19 +663,18 @@ free:
 int llc_conn_ac_send_rr_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
                 u8 f_bit = 1;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_rr_rsp(nskb, f_bit, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -729,19 +688,17 @@ free:
 int llc_conn_ac_send_ack_rsp_f_set_1(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
-                u8 f_bit = 1;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
-                llc_pdu_init_as_rr_rsp(nskb, f_bit, llc->vR);
+                llc_pdu_init_as_rr_rsp(nskb, 1, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -755,18 +712,17 @@ free:
 int llc_conn_ac_send_rr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_rr_rsp(nskb, 0, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -780,18 +736,17 @@ free:
 int llc_conn_ac_send_ack_xxx_x_set_0(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_rr_rsp(nskb, 0, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -815,8 +770,8 @@ void llc_conn_set_p_flag(struct sock *sk, u8 value)
 int llc_conn_ac_send_sabme_cmd_p_set_x(struct sock *sk, struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
         struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
                 struct llc_sap *sap = llc->sap;
@@ -824,12 +779,11 @@ int llc_conn_ac_send_sabme_cmd_p_set_x(struct sock *sk, struct sk_buff *skb)
 
                 if (llc->dev->flags & IFF_LOOPBACK)
                         dmac = llc->dev->dev_addr;
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_CMD);
                 llc_pdu_init_as_sabme_cmd(nskb, 1);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, dmac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
                 llc_conn_set_p_flag(sk, 1);
@@ -845,11 +799,11 @@ int llc_conn_ac_send_ua_rsp_f_set_p(struct sock *sk, struct sk_buff *skb)
 {
         u8 f_bit;
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         llc_pdu_decode_pf_bit(skb, &f_bit);
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
                 nskb->dev = llc->dev;
@@ -857,7 +811,7 @@ int llc_conn_ac_send_ua_rsp_f_set_p(struct sock *sk, struct sk_buff *skb)
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_ua_rsp(nskb, f_bit);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -886,7 +840,7 @@ int llc_conn_ac_start_p_timer(struct sock *sk, struct sk_buff *skb)
 
         llc_conn_set_p_flag(sk, 1);
         mod_timer(&llc->pf_cycle_timer.timer,
-                  jiffies + llc->pf_cycle_timer.expire * HZ);
+                  jiffies + llc->pf_cycle_timer.expire);
         return 0;
 }
 
@@ -957,7 +911,7 @@ static int llc_conn_ac_send_i_rsp_f_set_ackpf(struct sock *sk,
                             llc->daddr.lsap, LLC_PDU_RSP);
         llc_pdu_init_as_i_cmd(skb, llc->ack_pf, llc->vS, llc->vR);
         rc = llc_mac_hdr_init(skb, llc->dev->dev_addr, llc->daddr.mac);
-        if (!rc) {
+        if (likely(!rc)) {
                 llc_conn_send_pdu(sk, skb);
                 llc_conn_ac_inc_vs_by_1(sk, skb);
         }
@@ -1001,18 +955,17 @@ static int llc_conn_ac_send_rr_rsp_f_set_ackpf(struct sock *sk,
                                                struct sk_buff *skb)
 {
         int rc = -ENOBUFS;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct llc_sock *llc = llc_sk(sk);
+        struct sk_buff *nskb = llc_alloc_frame(sk, llc->dev);
 
         if (nskb) {
-                struct llc_sock *llc = llc_sk(sk);
                 struct llc_sap *sap = llc->sap;
 
-                nskb->dev = llc->dev;
                 llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap,
                                     llc->daddr.lsap, LLC_PDU_RSP);
                 llc_pdu_init_as_rr_rsp(nskb, llc->ack_pf, llc->vR);
                 rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac);
-                if (rc)
+                if (unlikely(rc))
                         goto free;
                 llc_conn_send_pdu(sk, nskb);
         }
@@ -1165,7 +1118,7 @@ int llc_conn_ac_start_ack_timer(struct sock *sk, struct sk_buff *skb)
 {
         struct llc_sock *llc = llc_sk(sk);
 
-        mod_timer(&llc->ack_timer.timer, jiffies + llc->ack_timer.expire * HZ);
+        mod_timer(&llc->ack_timer.timer, jiffies + llc->ack_timer.expire);
         return 0;
 }
 
@@ -1174,7 +1127,7 @@ int llc_conn_ac_start_rej_timer(struct sock *sk, struct sk_buff *skb)
         struct llc_sock *llc = llc_sk(sk);
 
         mod_timer(&llc->rej_sent_timer.timer,
-                  jiffies + llc->rej_sent_timer.expire * HZ);
+                  jiffies + llc->rej_sent_timer.expire);
         return 0;
 }
 
@@ -1185,7 +1138,7 @@ int llc_conn_ac_start_ack_tmr_if_not_running(struct sock *sk,
 
         if (!timer_pending(&llc->ack_timer.timer))
                 mod_timer(&llc->ack_timer.timer,
-                          jiffies + llc->ack_timer.expire * HZ);
+                          jiffies + llc->ack_timer.expire);
         return 0;
 }
 
@@ -1233,7 +1186,7 @@ int llc_conn_ac_upd_nr_received(struct sock *sk, struct sk_buff *skb)
                 }
                 if (unacked)
                         mod_timer(&llc->ack_timer.timer,
-                                  jiffies + llc->ack_timer.expire * HZ);
+                                  jiffies + llc->ack_timer.expire);
         } else if (llc->failed_data_req) {
                 u8 f_bit;
 
@@ -1354,13 +1307,13 @@ int llc_conn_ac_set_vs_nr(struct sock *sk, struct sk_buff *skb)
         return 0;
 }
 
-int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb)
+static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb)
 {
         llc_sk(sk)->vS = (llc_sk(sk)->vS + 1) % 128;
         return 0;
 }
 
-void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data)
+static void llc_conn_tmr_common_cb(unsigned long timeout_data, u8 type)
 {
         struct sock *sk = (struct sock *)timeout_data;
         struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);
@@ -1369,59 +1322,31 @@ void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data)
         if (skb) {
                 struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
-                skb->sk  = sk;
-                ev->type = LLC_CONN_EV_TYPE_P_TMR;
+                skb_set_owner_r(skb, sk);
+                ev->type = type;
                 llc_process_tmr_ev(sk, skb);
         }
         bh_unlock_sock(sk);
 }
 
-void llc_conn_busy_tmr_cb(unsigned long timeout_data)
+void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data)
 {
-        struct sock *sk = (struct sock *)timeout_data;
-        struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);
-
-        bh_lock_sock(sk);
-        if (skb) {
-                struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_P_TMR);
+}
 
-                skb->sk  = sk;
-                ev->type = LLC_CONN_EV_TYPE_BUSY_TMR;
-                llc_process_tmr_ev(sk, skb);
-        }
-        bh_unlock_sock(sk);
+void llc_conn_busy_tmr_cb(unsigned long timeout_data)
+{
+        llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_BUSY_TMR);
 }
 
 void llc_conn_ack_tmr_cb(unsigned long timeout_data)
 {
-        struct sock* sk = (struct sock *)timeout_data;
-        struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);
-
-        bh_lock_sock(sk);
-        if (skb) {
-                struct llc_conn_state_ev *ev = llc_conn_ev(skb);
-
-                skb->sk  = sk;
-                ev->type = LLC_CONN_EV_TYPE_ACK_TMR;
-                llc_process_tmr_ev(sk, skb);
-        }
-        bh_unlock_sock(sk);
+        llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_ACK_TMR);
 }
 
 void llc_conn_rej_tmr_cb(unsigned long timeout_data)
 {
-        struct sock *sk = (struct sock *)timeout_data;
-        struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);
-
-        bh_lock_sock(sk);
-        if (skb) {
-                struct llc_conn_state_ev *ev = llc_conn_ev(skb);
-
-                skb->sk  = sk;
-                ev->type = LLC_CONN_EV_TYPE_REJ_TMR;
-                llc_process_tmr_ev(sk, skb);
-        }
-        bh_unlock_sock(sk);
+        llc_conn_tmr_common_cb(timeout_data, LLC_CONN_EV_TYPE_REJ_TMR);
 }
 
 int llc_conn_ac_rst_vs(struct sock *sk, struct sk_buff *skb)
diff --git a/net/llc/llc_c_ev.c b/net/llc/llc_c_ev.c
index d5bdb53a348f..c5deda246614 100644
--- a/net/llc/llc_c_ev.c
+++ b/net/llc/llc_c_ev.c
@@ -37,6 +37,7 @@
 #include <net/llc_conn.h>
 #include <net/llc_sap.h>
 #include <net/sock.h>
+#include <net/llc_c_ac.h>
 #include <net/llc_c_ev.h>
 #include <net/llc_pdu.h>
 
@@ -46,8 +47,6 @@
 #define dprintk(args...)
 #endif
 
-extern u16 llc_circular_between(u8 a, u8 b, u8 c);
-
 /**
  *      llc_util_ns_inside_rx_window - check if sequence number is in rx window
  *      @ns: sequence number of received pdu.
@@ -99,7 +98,7 @@ out:
 
 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->prim == LLC_CONN_PRIM &&
                ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -107,7 +106,7 @@ int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->prim == LLC_DATA_PRIM &&
                ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -115,7 +114,7 @@ int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_disc_req(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->prim == LLC_DISC_PRIM &&
                ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -123,7 +122,7 @@ int llc_conn_ev_disc_req(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rst_req(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->prim == LLC_RESET_PRIM &&
                ev->prim_type == LLC_PRIM_TYPE_REQ ? 0 : 1;
@@ -131,7 +130,7 @@ int llc_conn_ev_rst_req(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_local_busy_detected(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->type == LLC_CONN_EV_TYPE_SIMPLE &&
                ev->prim_type == LLC_CONN_EV_LOCAL_BUSY_DETECTED ? 0 : 1;
@@ -139,7 +138,7 @@ int llc_conn_ev_local_busy_detected(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_local_busy_cleared(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->type == LLC_CONN_EV_TYPE_SIMPLE &&
                ev->prim_type == LLC_CONN_EV_LOCAL_BUSY_CLEARED ? 0 : 1;
@@ -152,7 +151,7 @@ int llc_conn_ev_rx_bad_pdu(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_disc_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
+        const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
                LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_DISC ? 0 : 1;
@@ -160,7 +159,7 @@ int llc_conn_ev_rx_disc_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_dm_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
+        const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
                LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_DM ? 0 : 1;
@@ -168,7 +167,7 @@ int llc_conn_ev_rx_dm_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_frmr_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
+        const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
                LLC_U_PDU_RSP(pdu) == LLC_2_PDU_RSP_FRMR ? 0 : 1;
@@ -176,7 +175,7 @@ int llc_conn_ev_rx_frmr_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_i_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return llc_conn_space(sk, skb) &&
                LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -186,7 +185,7 @@ int llc_conn_ev_rx_i_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_i_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return llc_conn_space(sk, skb) &&
                LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -197,9 +196,9 @@ int llc_conn_ev_rx_i_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns(struct sock *sk,
                                               struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vr = llc_sk(sk)->vR;
-        u8 ns = LLC_I_GET_NS(pdu);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vr = llc_sk(sk)->vR;
+        const u8 ns = LLC_I_GET_NS(pdu);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
                LLC_I_PF_IS_0(pdu) && ns != vr &&
@@ -209,9 +208,9 @@ int llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns(struct sock *sk,
 int llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns(struct sock *sk,
                                               struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vr = llc_sk(sk)->vR;
-        u8 ns = LLC_I_GET_NS(pdu);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vr = llc_sk(sk)->vR;
+        const u8 ns = LLC_I_GET_NS(pdu);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
                LLC_I_PF_IS_1(pdu) && ns != vr &&
@@ -221,10 +220,11 @@ int llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns(struct sock *sk,
 int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk,
                                              struct sk_buff *skb)
 {
-        struct llc_pdu_sn * pdu = llc_pdu_sn_hdr(skb);
-        u8 vr = llc_sk(sk)->vR;
-        u8 ns = LLC_I_GET_NS(pdu);
-        u16 rc = LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) && ns != vr &&
+        const struct llc_pdu_sn * pdu = llc_pdu_sn_hdr(skb);
+        const u8 vr = llc_sk(sk)->vR;
+        const u8 ns = LLC_I_GET_NS(pdu);
+        const u16 rc = LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+                ns != vr &&
                  llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
         if (!rc)
                 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
@@ -234,7 +234,7 @@ int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk,
 
 int llc_conn_ev_rx_i_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return llc_conn_space(sk, skb) &&
                LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -244,7 +244,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_i_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
                LLC_I_PF_IS_1(pdu) &&
@@ -253,7 +253,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_i_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return llc_conn_space(sk, skb) &&
                LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
@@ -263,9 +263,9 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns(struct sock *sk,
                                               struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vr = llc_sk(sk)->vR;
-        u8 ns = LLC_I_GET_NS(pdu);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vr = llc_sk(sk)->vR;
+        const u8 ns = LLC_I_GET_NS(pdu);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
                LLC_I_PF_IS_0(pdu) && ns != vr &&
@@ -275,9 +275,9 @@ int llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns(struct sock *sk,
 int llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns(struct sock *sk,
                                               struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vr = llc_sk(sk)->vR;
-        u8 ns = LLC_I_GET_NS(pdu);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vr = llc_sk(sk)->vR;
+        const u8 ns = LLC_I_GET_NS(pdu);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
                LLC_I_PF_IS_1(pdu) && ns != vr &&
@@ -287,9 +287,9 @@ int llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns(struct sock *sk,
 int llc_conn_ev_rx_i_rsp_fbit_set_x_unexpd_ns(struct sock *sk,
                                               struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vr = llc_sk(sk)->vR;
-        u8 ns = LLC_I_GET_NS(pdu);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vr = llc_sk(sk)->vR;
+        const u8 ns = LLC_I_GET_NS(pdu);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) && ns != vr &&
                !llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
@@ -298,10 +298,11 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_unexpd_ns(struct sock *sk,
 int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,
                                              struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vr = llc_sk(sk)->vR;
-        u8 ns = LLC_I_GET_NS(pdu);
-        u16 rc = LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) && ns != vr &&
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vr = llc_sk(sk)->vR;
+        const u8 ns = LLC_I_GET_NS(pdu);
+        const u16 rc = LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_I(pdu) &&
+                ns != vr &&
                  llc_util_ns_inside_rx_window(ns, vr, llc_sk(sk)->rw) ? 0 : 1;
         if (!rc)
                 dprintk("%s: matched, state=%d, ns=%d, vr=%d\n",
@@ -311,7 +312,7 @@ int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,
 
 int llc_conn_ev_rx_rej_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_0(pdu) &&
@@ -320,7 +321,7 @@ int llc_conn_ev_rx_rej_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rej_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_1(pdu) &&
@@ -329,7 +330,7 @@ int llc_conn_ev_rx_rej_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rej_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_0(pdu) &&
@@ -338,7 +339,7 @@ int llc_conn_ev_rx_rej_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rej_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_1(pdu) &&
@@ -347,7 +348,7 @@ int llc_conn_ev_rx_rej_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rej_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
+        const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PDU_RSP(pdu) == LLC_2_PDU_RSP_REJ ? 0 : 1;
@@ -355,7 +356,7 @@ int llc_conn_ev_rx_rej_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rnr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_0(pdu) &&
@@ -364,7 +365,7 @@ int llc_conn_ev_rx_rnr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rnr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_1(pdu) &&
@@ -373,7 +374,7 @@ int llc_conn_ev_rx_rnr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rnr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_0(pdu) &&
@@ -382,7 +383,7 @@ int llc_conn_ev_rx_rnr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rnr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_1(pdu) &&
@@ -391,7 +392,7 @@ int llc_conn_ev_rx_rnr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_0(pdu) &&
@@ -400,7 +401,7 @@ int llc_conn_ev_rx_rr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
                LLC_S_PF_IS_1(pdu) &&
@@ -409,7 +410,7 @@ int llc_conn_ev_rx_rr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return llc_conn_space(sk, skb) &&
                LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
@@ -419,7 +420,7 @@ int llc_conn_ev_rx_rr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_rr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         return llc_conn_space(sk, skb) &&
                LLC_PDU_IS_RSP(pdu) && LLC_PDU_TYPE_IS_S(pdu) &&
@@ -429,7 +430,7 @@ int llc_conn_ev_rx_rr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_rx_sabme_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
+        const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
         return LLC_PDU_IS_CMD(pdu) && LLC_PDU_TYPE_IS_U(pdu) &&
                LLC_U_PDU_CMD(pdu) == LLC_2_PDU_CMD_SABME ? 0 : 1;
@@ -446,7 +447,7 @@ int llc_conn_ev_rx_ua_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ev_rx_xxx_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 {
         u16 rc = 1;
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
 
         if (LLC_PDU_IS_CMD(pdu)) {
                 if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) {
@@ -461,7 +462,7 @@ int llc_conn_ev_rx_xxx_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb)
 int llc_conn_ev_rx_xxx_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
         u16 rc = 1;
-        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
+        const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
         if (LLC_PDU_IS_CMD(pdu)) {
                 if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu))
@@ -477,32 +478,10 @@ int llc_conn_ev_rx_xxx_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb)
         return rc;
 }
 
-int llc_conn_ev_rx_xxx_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb)
-{
-        u16 rc = 1;
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-
-        if (LLC_PDU_IS_RSP(pdu)) {
-                if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) {
-                        if (LLC_I_PF_IS_1(pdu))
-                                rc = 0;
-                } else if (LLC_PDU_TYPE_IS_U(pdu))
-                        switch (LLC_U_PDU_RSP(pdu)) {
-                        case LLC_2_PDU_RSP_UA:
-                        case LLC_2_PDU_RSP_DM:
-                        case LLC_2_PDU_RSP_FRMR:
-                                if (LLC_U_PF_IS_1(pdu))
-                                        rc = 0;
-                                break;
-                        }
-        }
-        return rc;
-}
-
 int llc_conn_ev_rx_xxx_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb)
 {
         u16 rc = 1;
-        struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
+        const struct llc_pdu_un *pdu = llc_pdu_un_hdr(skb);
 
         if (LLC_PDU_IS_RSP(pdu)) {
                 if (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu))
@@ -524,9 +503,9 @@ int llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr(struct sock *sk,
                                                struct sk_buff *skb)
 {
         u16 rc = 1;
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vs = llc_sk(sk)->vS;
-        u8 nr = LLC_I_GET_NR(pdu);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vs = llc_sk(sk)->vS;
+        const u8 nr = LLC_I_GET_NR(pdu);
 
         if (LLC_PDU_IS_CMD(pdu) &&
             (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
@@ -542,9 +521,9 @@ int llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr(struct sock *sk,
                                                struct sk_buff *skb)
 {
         u16 rc = 1;
-        struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
-        u8 vs = llc_sk(sk)->vS;
-        u8 nr = LLC_I_GET_NR(pdu);
+        const struct llc_pdu_sn *pdu = llc_pdu_sn_hdr(skb);
+        const u8 vs = llc_sk(sk)->vS;
+        const u8 nr = LLC_I_GET_NR(pdu);
 
         if (LLC_PDU_IS_RSP(pdu) &&
             (LLC_PDU_TYPE_IS_I(pdu) || LLC_PDU_TYPE_IS_S(pdu)) &&
@@ -563,28 +542,28 @@ int llc_conn_ev_rx_any_frame(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_p_tmr_exp(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->type != LLC_CONN_EV_TYPE_P_TMR;
 }
 
 int llc_conn_ev_ack_tmr_exp(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->type != LLC_CONN_EV_TYPE_ACK_TMR;
 }
 
 int llc_conn_ev_rej_tmr_exp(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->type != LLC_CONN_EV_TYPE_REJ_TMR;
 }
 
 int llc_conn_ev_busy_tmr_exp(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->type != LLC_CONN_EV_TYPE_BUSY_TMR;
 }
@@ -596,7 +575,7 @@ int llc_conn_ev_init_p_f_cycle(struct sock *sk, struct sk_buff *skb)
 
 int llc_conn_ev_tx_buffer_full(struct sock *sk, struct sk_buff *skb)
 {
-        struct llc_conn_state_ev *ev = llc_conn_ev(skb);
+        const struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         return ev->type == LLC_CONN_EV_TYPE_SIMPLE &&
                ev->prim_type == LLC_CONN_EV_TX_BUFF_FULL ? 0 : 1;
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 4c644bc70eae..042b24a8ca4c 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -40,6 +40,11 @@ static struct llc_conn_state_trans *llc_qualify_conn_ev(struct sock *sk,
 /* Offset table on connection states transition diagram */
 static int llc_offset_table[NBR_CONN_STATES][NBR_CONN_EV];
 
+int sysctl_llc2_ack_timeout = LLC2_ACK_TIME * HZ;
+int sysctl_llc2_p_timeout = LLC2_P_TIME * HZ;
+int sysctl_llc2_rej_timeout = LLC2_REJ_TIME * HZ;
+int sysctl_llc2_busy_timeout = LLC2_BUSY_TIME * HZ;
+
 /**
  *      llc_conn_state_process - sends event to connection state machine
  *      @sk: connection
@@ -53,7 +58,7 @@ static int llc_offset_table[NBR_CONN_STATES][NBR_CONN_EV];
 int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
 {
         int rc;
-        struct llc_sock *llc = llc_sk(sk);
+        struct llc_sock *llc = llc_sk(skb->sk);
         struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
         /*
@@ -63,13 +68,16 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
          */
         skb_get(skb);
         ev->ind_prim = ev->cfm_prim = 0;
-        rc = llc_conn_service(sk, skb); /* sending event to state machine */
-        if (rc) {
+        /*
+         * Send event to state machine
+         */
+        rc = llc_conn_service(skb->sk, skb);
+        if (unlikely(rc != 0)) {
                 printk(KERN_ERR "%s: llc_conn_service failed\n", __FUNCTION__);
                 goto out_kfree_skb;
         }
 
-        if (!ev->ind_prim && !ev->cfm_prim) {
+        if (unlikely(!ev->ind_prim && !ev->cfm_prim)) {
                 /* indicate or confirm not required */
                 /* XXX this is not very pretty, perhaps we should store
                  * XXX indicate/confirm-needed state in the llc_conn_state_ev
@@ -80,13 +88,13 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
                 goto out_skb_put;
         }
 
-        if (ev->ind_prim && ev->cfm_prim) /* Paranoia */
+        if (unlikely(ev->ind_prim && ev->cfm_prim)) /* Paranoia */
                 skb_get(skb);
 
         switch (ev->ind_prim) {
         case LLC_DATA_PRIM:
-                llc_save_primitive(skb, LLC_DATA_PRIM);
-                if (sock_queue_rcv_skb(sk, skb)) {
+                llc_save_primitive(sk, skb, LLC_DATA_PRIM);
+                if (unlikely(sock_queue_rcv_skb(sk, skb))) {
                         /*
                          * shouldn't happen
                          */
@@ -95,13 +103,14 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
                         kfree_skb(skb);
                 }
                 break;
-        case LLC_CONN_PRIM: {
-                struct sock *parent = skb->sk;
-
-                skb->sk = sk;
-                skb_queue_tail(&parent->sk_receive_queue, skb);
-                sk->sk_state_change(parent);
-        }
+        case LLC_CONN_PRIM:
+                /*
+                 * Can't be sock_queue_rcv_skb, because we have to leave the
+                 * skb->sk pointing to the newly created struct sock in
+                 * llc_conn_handler. -acme
+                 */
+                skb_queue_tail(&sk->sk_receive_queue, skb);
+                sk->sk_state_change(sk);
                 break;
         case LLC_DISC_PRIM:
                 sock_hold(sk);
@@ -111,8 +120,8 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
                         sk->sk_socket->state  = SS_UNCONNECTED;
                         sk->sk_state          = TCP_CLOSE;
                         if (!sock_flag(sk, SOCK_DEAD)) {
-                                sk->sk_state_change(sk);
                                 sock_set_flag(sk, SOCK_DEAD);
+                                sk->sk_state_change(sk);
                         }
                 }
                 kfree_skb(skb);
@@ -465,7 +474,7 @@ static int llc_exec_conn_trans_actions(struct sock *sk,
 }
 
 /**
- *      llc_lookup_established - Finds connection for the remote/local sap/mac
+ *      __llc_lookup_established - Finds connection for the remote/local sap/mac
  *      @sap: SAP
  *      @daddr: address of remote LLC (MAC + SAP)
  *      @laddr: address of local LLC (MAC + SAP)
@@ -473,14 +482,16 @@ static int llc_exec_conn_trans_actions(struct sock *sk,
  *      Search connection list of the SAP and finds connection using the remote
  *      mac, remote sap, local mac, and local sap. Returns pointer for
  *      connection found, %NULL otherwise.
+ *      Caller has to make sure local_bh is disabled.
  */
-struct sock *llc_lookup_established(struct llc_sap *sap, struct llc_addr *daddr,
-                                    struct llc_addr *laddr)
+static struct sock *__llc_lookup_established(struct llc_sap *sap,
+                                             struct llc_addr *daddr,
+                                             struct llc_addr *laddr)
 {
         struct sock *rc;
         struct hlist_node *node;
 
-        read_lock_bh(&sap->sk_list.lock);
+        read_lock(&sap->sk_list.lock);
         sk_for_each(rc, node, &sap->sk_list.list) {
                 struct llc_sock *llc = llc_sk(rc);
 
@@ -494,10 +505,22 @@ struct sock *llc_lookup_established(struct llc_sap *sap, struct llc_addr *daddr,
         }
         rc = NULL;
 found:
-        read_unlock_bh(&sap->sk_list.lock);
+        read_unlock(&sap->sk_list.lock);
         return rc;
 }
 
+struct sock *llc_lookup_established(struct llc_sap *sap,
+                                    struct llc_addr *daddr,
+                                    struct llc_addr *laddr)
+{
+        struct sock *sk;
+
+        local_bh_disable();
+        sk = __llc_lookup_established(sap, daddr, laddr);
+        local_bh_enable();
+        return sk;
+}
+
 /**
  *      llc_lookup_listener - Finds listener for local MAC + SAP
  *      @sap: SAP
@@ -506,6 +529,7 @@ found:
  *      Search connection list of the SAP and finds connection listening on
  *      local mac, and local sap. Returns pointer for parent socket found,
  *      %NULL otherwise.
+ *      Caller has to make sure local_bh is disabled.
  */
 static struct sock *llc_lookup_listener(struct llc_sap *sap,
                                         struct llc_addr *laddr)
@@ -513,7 +537,7 @@ static struct sock *llc_lookup_listener(struct llc_sap *sap,
         struct sock *rc;
         struct hlist_node *node;
 
-        read_lock_bh(&sap->sk_list.lock);
+        read_lock(&sap->sk_list.lock);
         sk_for_each(rc, node, &sap->sk_list.list) {
                 struct llc_sock *llc = llc_sk(rc);
 
@@ -527,10 +551,19 @@ static struct sock *llc_lookup_listener(struct llc_sap *sap,
         }
         rc = NULL;
 found:
-        read_unlock_bh(&sap->sk_list.lock);
+        read_unlock(&sap->sk_list.lock);
         return rc;
 }
 
+static struct sock *__llc_lookup(struct llc_sap *sap,
+                                 struct llc_addr *daddr,
+                                 struct llc_addr *laddr)
+{
+        struct sock *sk = __llc_lookup_established(sap, daddr, laddr);
+
+        return sk ? : llc_lookup_listener(sap, laddr);
+}
+
 /**
  *      llc_data_accept_state - designates if in this state data can be sent.
  *      @state: state of connection.
@@ -544,14 +577,14 @@ u8 llc_data_accept_state(u8 state)
 }
 
 /**
- *      find_next_offset - finds offset for next category of transitions
+ *      llc_find_next_offset - finds offset for next category of transitions
  *      @state: state table.
  *      @offset: start offset.
  *
  *      Finds offset of next category of transitions in transition table.
  *      Returns the start index of next category.
  */
-static u16 find_next_offset(struct llc_conn_state *state, u16 offset)
+static u16 __init llc_find_next_offset(struct llc_conn_state *state, u16 offset)
 {
         u16 cnt = 0;
         struct llc_conn_state_trans **next_trans;
@@ -578,8 +611,8 @@ void __init llc_build_offset_table(void)
                 next_offset = 0;
                 for (ev_type = 0; ev_type < NBR_CONN_EV; ev_type++) {
                         llc_offset_table[state][ev_type] = next_offset;
-                        next_offset += find_next_offset(curr_state,
-                                                        next_offset) + 1;
+                        next_offset += llc_find_next_offset(curr_state,
+                                                            next_offset) + 1;
                 }
         }
 }
@@ -623,6 +656,7 @@ static int llc_find_offset(int state, int ev_type)
  */
 void llc_sap_add_socket(struct llc_sap *sap, struct sock *sk)
 {
+        llc_sap_hold(sap);
         write_lock_bh(&sap->sk_list.lock);
         llc_sk(sk)->sap = sap;
         sk_add_node(sk, &sap->sk_list.list);
@@ -642,6 +676,7 @@ void llc_sap_remove_socket(struct llc_sap *sap, struct sock *sk)
         write_lock_bh(&sap->sk_list.lock);
         sk_del_node_init(sk);
         write_unlock_bh(&sap->sk_list.lock);
+        llc_sap_put(sap);
 }
 
 /**
@@ -654,15 +689,34 @@ void llc_sap_remove_socket(struct llc_sap *sap, struct sock *sk)
 static int llc_conn_rcv(struct sock* sk, struct sk_buff *skb)
 {
         struct llc_conn_state_ev *ev = llc_conn_ev(skb);
-        struct llc_sock *llc = llc_sk(sk);
 
-        if (!llc->dev)
-                llc->dev = skb->dev;
         ev->type   = LLC_CONN_EV_TYPE_PDU;
         ev->reason = 0;
         return llc_conn_state_process(sk, skb);
 }
 
+static struct sock *llc_create_incoming_sock(struct sock *sk,
+                                             struct net_device *dev,
+                                             struct llc_addr *saddr,
+                                             struct llc_addr *daddr)
+{
+        struct sock *newsk = llc_sk_alloc(sk->sk_family, GFP_ATOMIC,
+                                          sk->sk_prot);
+        struct llc_sock *newllc, *llc = llc_sk(sk);
+
+        if (!newsk)
+                goto out;
+        newllc = llc_sk(newsk);
+        memcpy(&newllc->laddr, daddr, sizeof(newllc->laddr));
+        memcpy(&newllc->daddr, saddr, sizeof(newllc->daddr));
+        newllc->dev = dev;
+        dev_hold(dev);
+        llc_sap_add_socket(llc->sap, newsk);
+        llc_sap_hold(llc->sap);
+out:
+        return newsk;
+}
+
 void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
 {
         struct llc_addr saddr, daddr;
@@ -673,35 +727,35 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
         llc_pdu_decode_da(skb, daddr.mac);
         llc_pdu_decode_dsap(skb, &daddr.lsap);
 
-        sk = llc_lookup_established(sap, &saddr, &daddr);
-        if (!sk) {
+        sk = __llc_lookup(sap, &saddr, &daddr);
+        if (!sk)
+                goto drop;
+
+        bh_lock_sock(sk);
+        /*
+         * This has to be done here and not at the upper layer ->accept
+         * method because of the way the PROCOM state machine works:
+         * it needs to set several state variables (see, for instance,
+         * llc_adm_actions_2 in net/llc/llc_c_st.c) and send a packet to
+         * the originator of the new connection, and this state has to be
+         * in the newly created struct sock private area. -acme
+         */
+        if (unlikely(sk->sk_state == TCP_LISTEN)) {
+                struct sock *newsk = llc_create_incoming_sock(sk, skb->dev,
+                                                              &saddr, &daddr);
+                if (!newsk)
+                        goto drop_unlock;
+                skb_set_owner_r(skb, newsk);
+        } else {
                 /*
-                 * Didn't find an active connection; verify if there
-                 * is a listening socket for this llc addr
+                 * Can't be skb_set_owner_r, this will be done at the
+                 * llc_conn_state_process function, later on, when we will use
+                 * skb_queue_rcv_skb to send it to upper layers, this is
+                 * another trick required to cope with how the PROCOM state
+                 * machine works. -acme
                  */
-                struct llc_sock *llc;
-                struct sock *parent = llc_lookup_listener(sap, &daddr);
-
-                if (!parent) {
-                        dprintk("llc_lookup_listener failed!\n");
-                        goto drop;
-                }
-
-                sk = llc_sk_alloc(parent->sk_family, GFP_ATOMIC, parent->sk_prot);
-                if (!sk) {
-                        sock_put(parent);
-                        goto drop;
-                }
-                llc = llc_sk(sk);
-                memcpy(&llc->laddr, &daddr, sizeof(llc->laddr));
-                memcpy(&llc->daddr, &saddr, sizeof(llc->daddr));
-                llc_sap_add_socket(sap, sk);
-                sock_hold(sk);
-                sock_put(parent);
-                skb->sk = parent;
-        } else
                 skb->sk = sk;
-        bh_lock_sock(sk);
+        }
         if (!sock_owned_by_user(sk))
                 llc_conn_rcv(sk, skb);
         else {
@@ -709,11 +763,16 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
                 llc_set_backlog_type(skb, LLC_PACKET);
                 sk_add_backlog(sk, skb);
         }
+out:
         bh_unlock_sock(sk);
         sock_put(sk);
         return;
 drop:
         kfree_skb(skb);
+        return;
+drop_unlock:
+        kfree_skb(skb);
+        goto out;
 }
 
 #undef LLC_REFCNT_DEBUG
@@ -722,32 +781,6 @@ static atomic_t llc_sock_nr;
 #endif
 
 /**
- *      llc_release_sockets - releases all sockets in a sap
- *      @sap: sap to release its sockets
- *
- *      Releases all connections of a sap. Returns 0 if all actions complete
- *      successfully, nonzero otherwise
- */
-int llc_release_sockets(struct llc_sap *sap)
-{
-        int rc = 0;
-        struct sock *sk;
-        struct hlist_node *node;
-
-        write_lock_bh(&sap->sk_list.lock);
-
-        sk_for_each(sk, node, &sap->sk_list.list) {
-                llc_sk(sk)->state = LLC_CONN_STATE_TEMP;
-
-                if (llc_send_disc(sk))
-                        rc = 1;
-        }
-
-        write_unlock_bh(&sap->sk_list.lock);
-        return rc;
-}
-
-/**
  *      llc_backlog_rcv - Processes rx frames and expired timers.
  *      @sk: LLC sock (p8022 connection)
  *      @skb: queued rx frame or event
@@ -762,14 +795,14 @@ static int llc_backlog_rcv(struct sock *sk, struct sk_buff *skb)
         int rc = 0;
         struct llc_sock *llc = llc_sk(sk);
 
-        if (llc_backlog_type(skb) == LLC_PACKET) {
-                if (llc->state > 1) /* not closed */
+        if (likely(llc_backlog_type(skb) == LLC_PACKET)) {
+                if (likely(llc->state > 1)) /* not closed */
                         rc = llc_conn_rcv(sk, skb);
                 else
                         goto out_kfree_skb;
         } else if (llc_backlog_type(skb) == LLC_EVENT) {
                 /* timer expiration event */
-                if (llc->state > 1)  /* not closed */
+                if (likely(llc->state > 1))  /* not closed */
                         rc = llc_conn_state_process(sk, skb);
                 else
                         goto out_kfree_skb;
@@ -799,22 +832,22 @@ static void llc_sk_init(struct sock* sk)
         llc->dec_step = llc->connect_step = 1;
 
         init_timer(&llc->ack_timer.timer);
-        llc->ack_timer.expire         = LLC_ACK_TIME;
+        llc->ack_timer.expire         = sysctl_llc2_ack_timeout;
         llc->ack_timer.timer.data     = (unsigned long)sk;
         llc->ack_timer.timer.function = llc_conn_ack_tmr_cb;
 
         init_timer(&llc->pf_cycle_timer.timer);
-        llc->pf_cycle_timer.expire         = LLC_P_TIME;
+        llc->pf_cycle_timer.expire         = sysctl_llc2_p_timeout;
         llc->pf_cycle_timer.timer.data     = (unsigned long)sk;
         llc->pf_cycle_timer.timer.function = llc_conn_pf_cycle_tmr_cb;
 
         init_timer(&llc->rej_sent_timer.timer);
-        llc->rej_sent_timer.expire         = LLC_REJ_TIME;
+        llc->rej_sent_timer.expire         = sysctl_llc2_rej_timeout;
         llc->rej_sent_timer.timer.data     = (unsigned long)sk;
         llc->rej_sent_timer.timer.function = llc_conn_rej_tmr_cb;
 
         init_timer(&llc->busy_state_timer.timer);
-        llc->busy_state_timer.expire         = LLC_BUSY_TIME;
+        llc->busy_state_timer.expire         = sysctl_llc2_busy_timeout;
         llc->busy_state_timer.timer.data     = (unsigned long)sk;
         llc->busy_state_timer.timer.function = llc_conn_busy_tmr_cb;
 
@@ -834,7 +867,8 @@ static void llc_sk_init(struct sock* sk)
  *      Allocates a LLC sock and initializes it. Returns the new LLC sock
  *      or %NULL if there's no memory available for one
  */
-struct sock *llc_sk_alloc(int family, int priority, struct proto *prot)
+struct sock *llc_sk_alloc(int family, unsigned int __nocast priority,
+                         struct proto *prot)
 {
         struct sock *sk = sk_alloc(family, priority, prot, 1);
 
diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c
index 9727455bf0e7..ab0fcd32fd84 100644
--- a/net/llc/llc_core.c
+++ b/net/llc/llc_core.c
@@ -40,6 +40,7 @@ static struct llc_sap *llc_sap_alloc(void)
                 sap->state = LLC_SAP_STATE_ACTIVE;
                 memcpy(sap->laddr.mac, llc_station_mac_sa, ETH_ALEN);
                 rwlock_init(&sap->sk_list.lock);
+                atomic_set(&sap->refcnt, 1);
         }
         return sap;
 }
@@ -52,9 +53,7 @@ static struct llc_sap *llc_sap_alloc(void)
  */
 static void llc_add_sap(struct llc_sap *sap)
 {
-        write_lock_bh(&llc_sap_list_lock);
         list_add_tail(&sap->node, &llc_sap_list);
-        write_unlock_bh(&llc_sap_list_lock);
 }
 
 /**
@@ -70,11 +69,25 @@ static void llc_del_sap(struct llc_sap *sap)
         write_unlock_bh(&llc_sap_list_lock);
 }
 
+static struct llc_sap *__llc_sap_find(unsigned char sap_value)
+{
+        struct llc_sap* sap;
+
+        list_for_each_entry(sap, &llc_sap_list, node)
+                if (sap->laddr.lsap == sap_value)
+                        goto out;
+        sap = NULL;
+out:
+        return sap;
+}
+
 /**
  *      llc_sap_find - searchs a SAP in station
  *      @sap_value: sap to be found
  *
  *      Searchs for a sap in the sap list of the LLC's station upon the sap ID.
+ *      If the sap is found it will be refcounted and the user will have to do
+ *      a llc_sap_put after use.
  *      Returns the sap or %NULL if not found.
  */
 struct llc_sap *llc_sap_find(unsigned char sap_value)
@@ -82,11 +95,9 @@ struct llc_sap *llc_sap_find(unsigned char sap_value)
         struct llc_sap* sap;
 
         read_lock_bh(&llc_sap_list_lock);
-        list_for_each_entry(sap, &llc_sap_list, node)
-                if (sap->laddr.lsap == sap_value)
-                        goto out;
-        sap = NULL;
-out:
+        sap = __llc_sap_find(sap_value);
+        if (sap)
+                llc_sap_hold(sap);
         read_unlock_bh(&llc_sap_list_lock);
         return sap;
 }
@@ -106,19 +117,20 @@ struct llc_sap *llc_sap_open(unsigned char lsap,
                                          struct packet_type *pt,
                                          struct net_device *orig_dev))
 {
-        struct llc_sap *sap = llc_sap_find(lsap);
+        struct llc_sap *sap = NULL;
 
-        if (sap) { /* SAP already exists */
-                sap = NULL;
+        write_lock_bh(&llc_sap_list_lock);
+        if (__llc_sap_find(lsap)) /* SAP already exists */
                 goto out;
-        }
         sap = llc_sap_alloc();
         if (!sap)
                 goto out;
         sap->laddr.lsap = lsap;
         sap->rcv_func   = func;
+        llc_sap_hold(sap);
         llc_add_sap(sap);
 out:
+        write_unlock_bh(&llc_sap_list_lock);
         return sap;
 }
 
diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c
index 0f84f66018e4..ba90f7f0801a 100644
--- a/net/llc/llc_if.c
+++ b/net/llc/llc_if.c
@@ -47,14 +47,11 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)
         int rc = -ECONNABORTED;
         struct llc_sock *llc = llc_sk(sk);
 
-        if (llc->state == LLC_CONN_STATE_ADM)
+        if (unlikely(llc->state == LLC_CONN_STATE_ADM))
                 goto out;
         rc = -EBUSY;
-        if (llc_data_accept_state(llc->state)) { /* data_conn_refuse */
-                llc->failed_data_req = 1;
-                goto out;
-        }
-        if (llc->p_flag) {
+        if (unlikely(llc_data_accept_state(llc->state) || /* data_conn_refuse */
+                     llc->p_flag)) {
                 llc->failed_data_req = 1;
                 goto out;
         }
@@ -110,6 +107,7 @@ int llc_establish_connection(struct sock *sk, u8 *lmac, u8 *dmac, u8 dsap)
                 ev->type      = LLC_CONN_EV_TYPE_PRIM;
                 ev->prim      = LLC_CONN_PRIM;
                 ev->prim_type = LLC_PRIM_TYPE_REQ;
+                skb_set_owner_w(skb, sk);
                 rc = llc_conn_state_process(sk, skb);
         }
 out_put:
@@ -144,6 +142,7 @@ int llc_send_disc(struct sock *sk)
         skb = alloc_skb(0, GFP_ATOMIC);
         if (!skb)
                 goto out;
+        skb_set_owner_w(skb, sk);
         sk->sk_state  = TCP_CLOSING;
         ev            = llc_conn_ev(skb);
         ev->type      = LLC_CONN_EV_TYPE_PRIM;
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 13b46240b7a1..8f3addf0724c 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -99,15 +99,19 @@ out:
 static inline int llc_fixup_skb(struct sk_buff *skb)
 {
         u8 llc_len = 2;
-        struct llc_pdu_sn *pdu;
+        struct llc_pdu_un *pdu;
 
-        if (!pskb_may_pull(skb, sizeof(*pdu)))
+        if (unlikely(!pskb_may_pull(skb, sizeof(*pdu))))
                 return 0;
 
-        pdu = (struct llc_pdu_sn *)skb->data;
+        pdu = (struct llc_pdu_un *)skb->data;
         if ((pdu->ctrl_1 & LLC_PDU_TYPE_MASK) == LLC_PDU_TYPE_U)
                 llc_len = 1;
         llc_len += 2;
+
+        if (unlikely(!pskb_may_pull(skb, llc_len)))
+                return 0;
+
         skb->h.raw += llc_len;
         skb_pull(skb, llc_len);
         if (skb->protocol == htons(ETH_P_802_2)) {
@@ -166,17 +170,22 @@ int llc_rcv(struct sk_buff *skb, struct net_device *dev,
          */
         if (sap->rcv_func) {
                 sap->rcv_func(skb, dev, pt, orig_dev);
-                goto out;
+                goto out_put;
         }
         dest = llc_pdu_type(skb);
         if (unlikely(!dest || !llc_type_handlers[dest - 1]))
-                goto drop;
+                goto drop_put;
         llc_type_handlers[dest - 1](sap, skb);
+out_put:
+        llc_sap_put(sap);
 out:
         return 0;
 drop:
         kfree_skb(skb);
         goto out;
+drop_put:
+        kfree_skb(skb);
+        goto out_put;
 handle_station:
         if (!llc_station_handler)
                 goto drop;
diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index ab5784cf163e..b4d55b6abb67 100644
--- a/net/llc/llc_output.c
+++ b/net/llc/llc_output.c
@@ -98,7 +98,7 @@ int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
                             dsap, LLC_PDU_CMD);
         llc_pdu_init_as_ui_cmd(skb);
         rc = llc_mac_hdr_init(skb, skb->dev->dev_addr, dmac);
-        if (!rc)
+        if (likely(!rc))
                 rc = dev_queue_xmit(skb);
         return rc;
 }
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 36e8db3fa1a2..bd531cb235a7 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -134,7 +134,7 @@ static int llc_seq_socket_show(struct seq_file *seq, void *v)
         llc_ui_format_mac(seq, llc->daddr.mac);
         seq_printf(seq, "@%02X %8d %8d %2d %3d %4d\n", llc->daddr.lsap,
                    atomic_read(&sk->sk_wmem_alloc),
-                   atomic_read(&sk->sk_rmem_alloc),
+                   atomic_read(&sk->sk_rmem_alloc) - llc->copied_seq,
                    sk->sk_state,
                    sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : -1,
                    llc->link);
diff --git a/net/llc/llc_s_ac.c b/net/llc/llc_s_ac.c
index ed8ba7de6122..bb3580fb8cfe 100644
--- a/net/llc/llc_s_ac.c
+++ b/net/llc/llc_s_ac.c
@@ -58,7 +58,7 @@ int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb)
                             ev->daddr.lsap, LLC_PDU_CMD);
         llc_pdu_init_as_ui_cmd(skb);
         rc = llc_mac_hdr_init(skb, ev->saddr.mac, ev->daddr.mac);
-        if (!rc)
+        if (likely(!rc))
                 rc = dev_queue_xmit(skb);
         return rc;
 }
@@ -81,7 +81,7 @@ int llc_sap_action_send_xid_c(struct llc_sap *sap, struct sk_buff *skb)
                             ev->daddr.lsap, LLC_PDU_CMD);
         llc_pdu_init_as_xid_cmd(skb, LLC_XID_NULL_CLASS_2, 0);
         rc = llc_mac_hdr_init(skb, ev->saddr.mac, ev->daddr.mac);
-        if (!rc)
+        if (likely(!rc))
                 rc = dev_queue_xmit(skb);
         return rc;
 }
@@ -103,15 +103,14 @@ int llc_sap_action_send_xid_r(struct llc_sap *sap, struct sk_buff *skb)
         llc_pdu_decode_sa(skb, mac_da);
         llc_pdu_decode_da(skb, mac_sa);
         llc_pdu_decode_ssap(skb, &dsap);
-        nskb = llc_alloc_frame();
+        nskb = llc_alloc_frame(NULL, skb->dev);
         if (!nskb)
                 goto out;
-        nskb->dev = skb->dev;
         llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap, dsap,
                             LLC_PDU_RSP);
         llc_pdu_init_as_xid_rsp(nskb, LLC_XID_NULL_CLASS_2, 0);
         rc = llc_mac_hdr_init(nskb, mac_sa, mac_da);
-        if (!rc)
+        if (likely(!rc))
                 rc = dev_queue_xmit(nskb);
 out:
         return rc;
@@ -135,7 +134,7 @@ int llc_sap_action_send_test_c(struct llc_sap *sap, struct sk_buff *skb)
                             ev->daddr.lsap, LLC_PDU_CMD);
         llc_pdu_init_as_test_cmd(skb);
         rc = llc_mac_hdr_init(skb, ev->saddr.mac, ev->daddr.mac);
-        if (!rc)
+        if (likely(!rc))
                 rc = dev_queue_xmit(skb);
         return rc;
 }
@@ -149,15 +148,14 @@ int llc_sap_action_send_test_r(struct llc_sap *sap, struct sk_buff *skb)
         llc_pdu_decode_sa(skb, mac_da);
         llc_pdu_decode_da(skb, mac_sa);
         llc_pdu_decode_ssap(skb, &dsap);
-        nskb = llc_alloc_frame();
+        nskb = llc_alloc_frame(NULL, skb->dev);
         if (!nskb)
                 goto out;
-        nskb->dev = skb->dev;
         llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap, dsap,
                             LLC_PDU_RSP);
         llc_pdu_init_as_test_rsp(nskb, skb);
         rc = llc_mac_hdr_init(nskb, mac_sa, mac_da);
-        if (!rc)
+        if (likely(!rc))
                 rc = dev_queue_xmit(nskb);
 out:
         return rc;
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 34228ef14985..4029ceee9b91 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -26,11 +26,12 @@
 
 /**
  *      llc_alloc_frame - allocates sk_buff for frame
+ *      @dev: network device this skb will be sent over
  *
  *      Allocates an sk_buff for frame and initializes sk_buff fields.
  *      Returns allocated skb or %NULL when out of memory.
  */
-struct sk_buff *llc_alloc_frame(void)
+struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev)
 {
         struct sk_buff *skb = alloc_skb(128, GFP_ATOMIC);
 
@@ -38,18 +39,23 @@ struct sk_buff *llc_alloc_frame(void)
                 skb_reserve(skb, 50);
                 skb->nh.raw   = skb->h.raw = skb->data;
                 skb->protocol = htons(ETH_P_802_2);
-                skb->dev      = dev_base->next;
+                skb->dev      = dev;
                 skb->mac.raw  = skb->head;
+                if (sk != NULL)
+                        skb_set_owner_w(skb, sk);
         }
         return skb;
 }
 
-void llc_save_primitive(struct sk_buff* skb, u8 prim)
+void llc_save_primitive(struct sock *sk, struct sk_buff* skb, u8 prim)
 {
-        struct sockaddr_llc *addr = llc_ui_skb_cb(skb);
+        struct sockaddr_llc *addr;
 
+        if (skb->sk->sk_type == SOCK_STREAM) /* See UNIX98 */
+                return;
        /* save primitive for use by the user. */
-        addr->sllc_family = skb->sk->sk_family;
+        addr              = llc_ui_skb_cb(skb);
+        addr->sllc_family = sk->sk_family;
         addr->sllc_arphrd = skb->dev->type;
         addr->sllc_test   = prim == LLC_TEST_PRIM;
         addr->sllc_xid    = prim == LLC_XID_PRIM;
@@ -189,7 +195,7 @@ static void llc_sap_state_process(struct llc_sap *sap, struct sk_buff *skb)
                 if (skb->sk->sk_state == TCP_LISTEN)
                         kfree_skb(skb);
                 else {
-                        llc_save_primitive(skb, ev->prim);
+                        llc_save_primitive(skb->sk, skb, ev->prim);
 
                         /* queue skb to the user. */
                         if (sock_queue_rcv_skb(skb->sk, skb))
@@ -308,7 +314,7 @@ void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb)
 
         sk = llc_lookup_dgram(sap, &laddr);
         if (sk) {
-                skb->sk = sk;
+                skb_set_owner_r(skb, sk);
                 llc_sap_rcv(sap, skb);
                 sock_put(sk);
         } else
diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c
index 8fe48a24bad5..f37dbf8ef126 100644
--- a/net/llc/llc_station.c
+++ b/net/llc/llc_station.c
@@ -50,6 +50,10 @@ struct llc_station {
         struct sk_buff_head         mac_pdu_q;
 };
 
+#define LLC_STATION_ACK_TIME (3 * HZ)
+
+int sysctl_llc_station_ack_timeout = LLC_STATION_ACK_TIME;
+
 /* Types of events (possible values in 'ev->type') */
 #define LLC_STATION_EV_TYPE_SIMPLE      1
 #define LLC_STATION_EV_TYPE_CONDITION   2
@@ -218,7 +222,8 @@ static void llc_station_send_pdu(struct sk_buff *skb)
 
 static int llc_station_ac_start_ack_timer(struct sk_buff *skb)
 {
-        mod_timer(&llc_main_station.ack_timer, jiffies + LLC_ACK_TIME * HZ);
+        mod_timer(&llc_main_station.ack_timer,
+                  jiffies + sysctl_llc_station_ack_timeout);
         return 0;
 }
 
@@ -249,14 +254,14 @@ static int llc_station_ac_inc_xid_r_cnt_by_1(struct sk_buff *skb)
 static int llc_station_ac_send_null_dsap_xid_c(struct sk_buff *skb)
 {
         int rc = 1;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct sk_buff *nskb = llc_alloc_frame(NULL, skb->dev);
 
         if (!nskb)
                 goto out;
         llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, 0, LLC_PDU_CMD);
         llc_pdu_init_as_xid_cmd(nskb, LLC_XID_NULL_CLASS_2, 127);
         rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, llc_station_mac_sa);
-        if (rc)
+        if (unlikely(rc))
                 goto free;
         llc_station_send_pdu(nskb);
 out:
@@ -270,18 +275,17 @@ static int llc_station_ac_send_xid_r(struct sk_buff *skb)
 {
         u8 mac_da[ETH_ALEN], dsap;
         int rc = 1;
-        struct sk_buff* nskb = llc_alloc_frame();
+        struct sk_buff* nskb = llc_alloc_frame(NULL, skb->dev);
 
         if (!nskb)
                 goto out;
         rc = 0;
-        nskb->dev = skb->dev;
         llc_pdu_decode_sa(skb, mac_da);
         llc_pdu_decode_ssap(skb, &dsap);
         llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
         llc_pdu_init_as_xid_rsp(nskb, LLC_XID_NULL_CLASS_2, 127);
         rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da);
-        if (rc)
+        if (unlikely(rc))
                 goto free;
         llc_station_send_pdu(nskb);
 out:
@@ -295,18 +299,17 @@ static int llc_station_ac_send_test_r(struct sk_buff *skb)
 {
         u8 mac_da[ETH_ALEN], dsap;
         int rc = 1;
-        struct sk_buff *nskb = llc_alloc_frame();
+        struct sk_buff *nskb = llc_alloc_frame(NULL, skb->dev);
 
         if (!nskb)
                 goto out;
         rc = 0;
-        nskb->dev = skb->dev;
         llc_pdu_decode_sa(skb, mac_da);
         llc_pdu_decode_ssap(skb, &dsap);
         llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, 0, dsap, LLC_PDU_RSP);
         llc_pdu_init_as_test_rsp(nskb, skb);
         rc = llc_mac_hdr_init(nskb, llc_station_mac_sa, mac_da);
-        if (rc)
+        if (unlikely(rc))
                 goto free;
         llc_station_send_pdu(nskb);
 out:
@@ -689,7 +692,8 @@ int __init llc_station_init(void)
         init_timer(&llc_main_station.ack_timer);
         llc_main_station.ack_timer.data     = (unsigned long)&llc_main_station;
         llc_main_station.ack_timer.function = llc_station_ack_tmr_cb;
-
+        llc_main_station.ack_timer.expires  = jiffies +
+                                                sysctl_llc_station_ack_timeout;
         skb = alloc_skb(0, GFP_ATOMIC);
         if (!skb)
                 goto out;
@@ -697,7 +701,6 @@ int __init llc_station_init(void)
         llc_set_station_handler(llc_station_rcv);
         ev = llc_station_ev(skb);
         memset(ev, 0, sizeof(*ev));
-        llc_main_station.ack_timer.expires = jiffies + 3 * HZ;
         llc_main_station.maximum_retry  = 1;
         llc_main_station.state          = LLC_STATION_STATE_DOWN;
         ev->type        = LLC_STATION_EV_TYPE_SIMPLE;
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c
new file mode 100644
index 000000000000..d1eaddb13633
--- /dev/null
+++ b/net/llc/sysctl_net_llc.c
@@ -0,0 +1,131 @@
+/*
+ * sysctl_net_llc.c: sysctl interface to LLC net subsystem.
+ * 
+ * Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ */
+
+#include <linux/config.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/sysctl.h>
+#include <net/llc.h>
+
+#ifndef CONFIG_SYSCTL
+#error This file should not be compiled without CONFIG_SYSCTL defined
+#endif
+
+static struct ctl_table llc2_timeout_table[] = {
+        {
+                .ctl_name       = NET_LLC2_ACK_TIMEOUT,
+                .procname       = "ack",
+                .data           = &sysctl_llc2_ack_timeout,
+                .maxlen         = sizeof(long),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_jiffies,
+                .strategy       = &sysctl_jiffies,
+        },
+        {
+                .ctl_name       = NET_LLC2_BUSY_TIMEOUT,
+                .procname       = "busy",
+                .data           = &sysctl_llc2_busy_timeout,
+                .maxlen         = sizeof(long),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_jiffies,
+                .strategy       = &sysctl_jiffies,
+        },
+        {
+                .ctl_name       = NET_LLC2_P_TIMEOUT,
+                .procname       = "p",
+                .data           = &sysctl_llc2_p_timeout,
+                .maxlen         = sizeof(long),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_jiffies,
+                .strategy       = &sysctl_jiffies,
+        },
+        {
+                .ctl_name       = NET_LLC2_REJ_TIMEOUT,
+                .procname       = "rej",
+                .data           = &sysctl_llc2_rej_timeout,
+                .maxlen         = sizeof(long),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_jiffies,
+                .strategy       = &sysctl_jiffies,
+        },
+        { 0 },
+};
+
+static struct ctl_table llc_station_table[] = {
+        {
+                .ctl_name       = NET_LLC_STATION_ACK_TIMEOUT,
+                .procname       = "ack_timeout",
+                .data           = &sysctl_llc_station_ack_timeout,
+                .maxlen         = sizeof(long),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_jiffies,
+                .strategy       = &sysctl_jiffies,
+        },
+        { 0 },
+};
+
+static struct ctl_table llc2_dir_timeout_table[] = {
+        {
+                .ctl_name       = NET_LLC2,
+                .procname       = "timeout",
+                .mode           = 0555,
+                .child          = llc2_timeout_table,
+        },
+        { 0 },
+};
+
+static struct ctl_table llc_table[] = {
+        {
+                .ctl_name       = NET_LLC2,
+                .procname       = "llc2",
+                .mode           = 0555,
+                .child          = llc2_dir_timeout_table,
+        },
+        {
+                .ctl_name       = NET_LLC_STATION,
+                .procname       = "station",
+                .mode           = 0555,
+                .child          = llc_station_table,
+        },
+        { 0 },
+};
+
+static struct ctl_table llc_dir_table[] = {
+        {
+                .ctl_name       = NET_LLC,
+                .procname       = "llc",
+                .mode           = 0555,
+                .child          = llc_table,
+        },
+        { 0 },
+};
+
+static struct ctl_table llc_root_table[] = {
+        {
+                .ctl_name       = CTL_NET,
+                .procname       = "net",
+                .mode           = 0555,
+                .child          = llc_dir_table,
+        },
+        { 0 },
+};
+
+static struct ctl_table_header *llc_table_header;
+
+int __init llc_sysctl_init(void)
+{
+        llc_table_header = register_sysctl_table(llc_root_table, 1);
+
+        return llc_table_header ? 0 : -ENOMEM;
+}
+
+void llc_sysctl_exit(void)
+{
+        if (llc_table_header) {
+                unregister_sysctl_table(llc_table_header);
+                llc_table_header = NULL;
+        }
+}
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index ff5601ceedcb..efcd10f996ba 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -494,8 +494,8 @@ __build_packet_message(struct nfulnl_instance *inst,
         if (skb->tstamp.off_sec) {
                 struct nfulnl_msg_packet_timestamp ts;
 
-                ts.sec = cpu_to_be64(skb_tv_base.tv_sec + skb->tstamp.off_sec);
-                ts.usec = cpu_to_be64(skb_tv_base.tv_usec + skb->tstamp.off_usec);
+                ts.sec = cpu_to_be64(skb->tstamp.off_sec);
+                ts.usec = cpu_to_be64(skb->tstamp.off_usec);
 
                 NFA_PUT(inst->skb, NFULA_TIMESTAMP, sizeof(ts), &ts);
         }
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index f81fe8c52e99..eaa44c49567b 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -492,8 +492,8 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
         if (entry->skb->tstamp.off_sec) {
                 struct nfqnl_msg_packet_timestamp ts;
 
-                ts.sec = cpu_to_be64(skb_tv_base.tv_sec + entry->skb->tstamp.off_sec);
-                ts.usec = cpu_to_be64(skb_tv_base.tv_usec + entry->skb->tstamp.off_usec);
+                ts.sec = cpu_to_be64(entry->skb->tstamp.off_sec);
+                ts.usec = cpu_to_be64(entry->skb->tstamp.off_usec);
 
                 NFA_PUT(skb, NFQA_TIMESTAMP, sizeof(ts), &ts);
         }
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index ee865d88183b..499ae3df4a44 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -654,8 +654,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
                 __net_timestamp(skb);
                 sock_enable_timestamp(sk);
         }
-        h->tp_sec = skb_tv_base.tv_sec + skb->tstamp.off_sec;
-        h->tp_usec = skb_tv_base.tv_usec + skb->tstamp.off_usec;
+        h->tp_sec = skb->tstamp.off_sec;
+        h->tp_usec = skb->tstamp.off_usec;
 
         sll = (struct sockaddr_ll*)((u8*)h + TPACKET_ALIGN(sizeof(*h)));
         sll->sll_halen = 0;
@@ -761,12 +761,6 @@ static int packet_sendmsg(struct kiocb *iocb, struct socket *sock,
         if (dev->hard_header) {
                 int res;
                 err = -EINVAL;
-                if (saddr) {
-                        if (saddr->sll_halen != dev->addr_len)
-                                goto out_free;
-                        if (saddr->sll_hatype != dev->type)
-                                goto out_free;
-                }
                 res = dev->hard_header(skb, dev, ntohs(proto), addr, NULL, len);
                 if (sock->type != SOCK_DGRAM) {
                         skb->tail = skb->data;
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 5acb1680524a..829fdbc4400b 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1472,22 +1472,25 @@ static const char banner[] = KERN_INFO "F6FBB/G4KLX ROSE for Linux. Version 0.62
 static int __init rose_proto_init(void)
 {
         int i;
-        int rc = proto_register(&rose_proto, 0);
+        int rc;
 
+        if (rose_ndevs > 0x7FFFFFFF/sizeof(struct net_device *)) {
+                printk(KERN_ERR "ROSE: rose_proto_init - rose_ndevs parameter to large\n");
+                rc = -EINVAL;
+                goto out;
+        }
+
+        rc = proto_register(&rose_proto, 0);
         if (rc != 0)
                 goto out;
 
         rose_callsign = null_ax25_address;
 
-        if (rose_ndevs > 0x7FFFFFFF/sizeof(struct net_device *)) {
-                printk(KERN_ERR "ROSE: rose_proto_init - rose_ndevs parameter to large\n");
-                return -1;
-        }
-
         dev_rose = kmalloc(rose_ndevs * sizeof(struct net_device *), GFP_KERNEL);
         if (dev_rose == NULL) {
                 printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate device structure\n");
-                return -1;
+                rc = -ENOMEM;
+                goto out_proto_unregister;
         }
 
         memset(dev_rose, 0x00, rose_ndevs * sizeof(struct net_device*));
@@ -1500,10 +1503,12 @@ static int __init rose_proto_init(void)
                                    name, rose_setup);
                 if (!dev) {
                         printk(KERN_ERR "ROSE: rose_proto_init - unable to allocate memory\n");
+                        rc = -ENOMEM;
                         goto fail;
                 }
-                if (register_netdev(dev)) {
-                        printk(KERN_ERR "ROSE: netdevice regeistration failed\n");
+                rc = register_netdev(dev);
+                if (rc) {
+                        printk(KERN_ERR "ROSE: netdevice registration failed\n");
                         free_netdev(dev);
                         goto fail;
                 }
@@ -1536,8 +1541,9 @@ fail:
                 free_netdev(dev_rose[i]);
         }
         kfree(dev_rose);
+out_proto_unregister:
         proto_unregister(&rose_proto);
-        return -ENOMEM;
+        goto out;
 }
 module_init(rose_proto_init);
 
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 00eae5f9a01a..cf68a59fdc5a 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -393,10 +393,10 @@ META_COLLECTOR(int_sk_route_caps)
         dst->value = skb->sk->sk_route_caps;
 }
 
-META_COLLECTOR(int_sk_hashent)
+META_COLLECTOR(int_sk_hash)
 {
         SKIP_NONLOCAL(skb);
-        dst->value = skb->sk->sk_hashent;
+        dst->value = skb->sk->sk_hash;
 }
 
 META_COLLECTOR(int_sk_lingertime)
@@ -515,7 +515,7 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {
                 [META_ID(SK_FORWARD_ALLOCS)]    = META_FUNC(int_sk_fwd_alloc),
                 [META_ID(SK_ALLOCS)]            = META_FUNC(int_sk_alloc),
                 [META_ID(SK_ROUTE_CAPS)]        = META_FUNC(int_sk_route_caps),
-                [META_ID(SK_HASHENT)]           = META_FUNC(int_sk_hashent),
+                [META_ID(SK_HASH)]              = META_FUNC(int_sk_hash),
                 [META_ID(SK_LINGERTIME)]        = META_FUNC(int_sk_lingertime),
                 [META_ID(SK_ACK_BACKLOG)]       = META_FUNC(int_sk_ack_bl),
                 [META_ID(SK_MAX_ACK_BACKLOG)]   = META_FUNC(int_sk_max_ack_bl),
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index e7025be77691..f01d1c9002a1 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -147,7 +147,7 @@ static void sctp_v4_copy_addrlist(struct list_head *addrlist,
         struct sctp_sockaddr_entry *addr;
 
         rcu_read_lock();
-        if ((in_dev = __in_dev_get(dev)) == NULL) {
+        if ((in_dev = __in_dev_get_rcu(dev)) == NULL) {
                 rcu_read_unlock();
                 return;
         }
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 86073df418f5..505c7de10c50 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -2414,6 +2414,17 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(const struct sctp_endpoint *ep,
         skb_pull(chunk->skb, sizeof(sctp_shutdownhdr_t));
         chunk->subh.shutdown_hdr = sdh;
 
+        /* API 5.3.1.5 SCTP_SHUTDOWN_EVENT
+         * When a peer sends a SHUTDOWN, SCTP delivers this notification to
+         * inform the application that it should cease sending data.
+         */
+        ev = sctp_ulpevent_make_shutdown_event(asoc, 0, GFP_ATOMIC);
+        if (!ev) {
+                disposition = SCTP_DISPOSITION_NOMEM;
+                goto out;       
+        }
+        sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev));
+
         /* Upon the reception of the SHUTDOWN, the peer endpoint shall
          *  - enter the SHUTDOWN-RECEIVED state,
          *  - stop accepting new data from its SCTP user
@@ -2439,17 +2450,6 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(const struct sctp_endpoint *ep,
         sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_CTSN,
                         SCTP_U32(chunk->subh.shutdown_hdr->cum_tsn_ack));
 
-        /* API 5.3.1.5 SCTP_SHUTDOWN_EVENT
-         * When a peer sends a SHUTDOWN, SCTP delivers this notification to
-         * inform the application that it should cease sending data.
-         */
-        ev = sctp_ulpevent_make_shutdown_event(asoc, 0, GFP_ATOMIC);
-        if (!ev) {
-                disposition = SCTP_DISPOSITION_NOMEM;
-                goto out;       
-        }
-        sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev));
-
 out:
         return disposition;
 }
diff --git a/net/socket.c b/net/socket.c
index f9264472377f..3145103cdf54 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1145,8 +1145,11 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
         if (!try_module_get(net_families[family]->owner))
                 goto out_release;
 
-        if ((err = net_families[family]->create(sock, protocol)) < 0)
+        if ((err = net_families[family]->create(sock, protocol)) < 0) {
+                sock->ops = NULL;
                 goto out_module_put;
+        }
+
         /*
          * Now to bump the refcnt of the [loadable] module that owns this
          * socket at sock_release time we decrement its refcnt.
@@ -1360,16 +1363,16 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
         newsock->type = sock->type;
         newsock->ops = sock->ops;
 
-        err = security_socket_accept(sock, newsock);
-        if (err)
-                goto out_release;
-
         /*
          * We don't need try_module_get here, as the listening socket (sock)
          * has the protocol module (sock->ops->owner) held.
          */
         __module_get(newsock->ops->owner);
 
+        err = security_socket_accept(sock, newsock);
+        if (err)
+                goto out_release;
+
         err = sock->ops->accept(sock, newsock, sock->file->f_flags);
         if (err < 0)
                 goto out_release;
@@ -1700,7 +1703,9 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
         struct socket *sock;
         char address[MAX_SOCK_ADDR];
         struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
-        unsigned char ctl[sizeof(struct cmsghdr) + 20]; /* 20 is size of ipv6_pktinfo */
+        unsigned char ctl[sizeof(struct cmsghdr) + 20]
+                        __attribute__ ((aligned (sizeof(__kernel_size_t))));
+                        /* 20 is size of ipv6_pktinfo */
         unsigned char *ctl_buf = ctl;
         struct msghdr msg_sys;
         int err, ctl_len, iov_size, total_len;
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index c5241fcbb966..55538f6b60ff 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -16,6 +16,8 @@
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 
+#include <net/sock.h>
+
 #ifdef CONFIG_INET
 #include <net/ip.h>
 #endif