Merge branch 'linus' into x86/cpu

Conflicts: arch/x86/kernel/cpu/intel_cacheinfo.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
author: Ingo Molnar <mingo@elte.hu> 2008-07-28 10:26:31 -0400
committer: Ingo Molnar <mingo@elte.hu> 2008-07-28 10:26:31 -0400
commit: b7d0b6784565b846f3562608dfb3cf8516718724 (patch)
tree: 50a4931ce7e62e78b664bb8f43da2f4508c319f9 /net
parent: cdcf772ed163651cacac8098b4974aba7f9e1c73 (diff)
parent: c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff)
94 files changed, 1004 insertions, 993 deletions
diff --git a/net/802/psnap.c b/net/802/psnap.c
index ea4643931446..b3cfe5a14fca 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -31,11 +31,9 @@ static struct llc_sap *snap_sap;
 */
 static struct datalink_proto *find_snap_client(unsigned char *desc)
 {
-        struct list_head *entry;
        struct datalink_proto *proto = NULL, *p;
-        list_for_each_rcu(entry, &snap_list) {
+        list_for_each_entry_rcu(p, &snap_list, node) {
-                p = list_entry(entry, struct datalink_proto, node);
                if (!memcmp(p->type, desc, 5)) {
                        proto = p;
                        break;
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index f42bc2b26b85..4bf014e51f8c 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -569,6 +569,7 @@ static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)
 * separate class since they always nest.
 */
 static struct lock_class_key vlan_netdev_xmit_lock_key;
+static struct lock_class_key vlan_netdev_addr_lock_key;
 static void vlan_dev_set_lockdep_one(struct net_device *dev,
                                     struct netdev_queue *txq,
@@ -581,6 +582,9 @@ static void vlan_dev_set_lockdep_one(struct net_device *dev,
 static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)
 {
+        lockdep_set_class_and_subclass(&dev->addr_list_lock,
+                                       &vlan_netdev_addr_lock_key,
+                                       subclass);
        netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &subclass);
 }
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 4507f744f44e..cdf137af7adc 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -1285,7 +1285,7 @@ static int p9_socket_open(struct p9_trans *trans, struct socket *csocket)
        int fd, ret;
        csocket->sk->sk_allocation = GFP_NOIO;
-        fd = sock_map_fd(csocket);
+        fd = sock_map_fd(csocket, 0);
        if (fd < 0) {
                P9_EPRINTK(KERN_ERR, "p9_socket_open: failed to map fd\n");
                return fd;
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 07b5b82c5eab..0c850427a85b 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -959,7 +959,7 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -986,7 +986,7 @@ static unsigned long atalk_sum_skb(const struct sk_buff *skb, int offset,
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 844ca5f1b2d4..c85bf8f678dc 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -398,10 +398,6 @@ int hci_register_sysfs(struct hci_dev *hdev)
                if (device_create_file(dev, bt_attrs[i]) < 0)
                        BT_ERR("Failed to create device attribute");
-        if (sysfs_create_link(&bt_class->subsys.kobj,
-                                &dev->kobj, kobject_name(&dev->kobj)) < 0)
-                BT_ERR("Failed to create class symlink");
        return 0;
 }
@@ -409,9 +405,6 @@ void hci_unregister_sysfs(struct hci_dev *hdev)
 {
        BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
-        sysfs_remove_link(&bt_class->subsys.kobj,
-                                        kobject_name(&hdev->dev.kobj));
        device_del(&hdev->dev);
 }
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c
index 690bc3ab186c..1a58af51a2e2 100644
--- a/net/bridge/netfilter/ebtable_filter.c
+++ b/net/bridge/netfilter/ebtable_filter.c
@@ -93,28 +93,20 @@ static struct nf_hook_ops ebt_ops_filter[] __read_mostly = {
 static int __init ebtable_filter_init(void)
 {
-        int i, j, ret;
+        int ret;
        ret = ebt_register_table(&frame_filter);
        if (ret < 0)
                return ret;
-        for (i = 0; i < ARRAY_SIZE(ebt_ops_filter); i++)
+        ret = nf_register_hooks(ebt_ops_filter, ARRAY_SIZE(ebt_ops_filter));
-                if ((ret = nf_register_hook(&ebt_ops_filter[i])) < 0)
+        if (ret < 0)
-                        goto cleanup;
+                ebt_unregister_table(&frame_filter);
-        return ret;
-cleanup:
-        for (j = 0; j < i; j++)
-                nf_unregister_hook(&ebt_ops_filter[j]);
-        ebt_unregister_table(&frame_filter);
        return ret;
 }
 static void __exit ebtable_filter_fini(void)
 {
-        int i;
+        nf_unregister_hooks(ebt_ops_filter, ARRAY_SIZE(ebt_ops_filter));
-        for (i = 0; i < ARRAY_SIZE(ebt_ops_filter); i++)
-                nf_unregister_hook(&ebt_ops_filter[i]);
        ebt_unregister_table(&frame_filter);
 }
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c
index 5b495fe2d0b6..f60c1e78e575 100644
--- a/net/bridge/netfilter/ebtable_nat.c
+++ b/net/bridge/netfilter/ebtable_nat.c
@@ -100,28 +100,20 @@ static struct nf_hook_ops ebt_ops_nat[] __read_mostly = {
 static int __init ebtable_nat_init(void)
 {
-        int i, ret, j;
+        int ret;
        ret = ebt_register_table(&frame_nat);
        if (ret < 0)
                return ret;
-        for (i = 0; i < ARRAY_SIZE(ebt_ops_nat); i++)
+        ret = nf_register_hooks(ebt_ops_nat, ARRAY_SIZE(ebt_ops_nat));
-                if ((ret = nf_register_hook(&ebt_ops_nat[i])) < 0)
+        if (ret < 0)
-                        goto cleanup;
+                ebt_unregister_table(&frame_nat);
-        return ret;
-cleanup:
-        for (j = 0; j < i; j++)
-                nf_unregister_hook(&ebt_ops_nat[j]);
-        ebt_unregister_table(&frame_nat);
        return ret;
 }
 static void __exit ebtable_nat_fini(void)
 {
-        int i;
+        nf_unregister_hooks(ebt_ops_nat, ARRAY_SIZE(ebt_ops_nat));
-        for (i = 0; i < ARRAY_SIZE(ebt_ops_nat); i++)
-                nf_unregister_hook(&ebt_ops_nat[i]);
        ebt_unregister_table(&frame_nat);
 }
diff --git a/net/compat.c b/net/compat.c
index 6e1b03b51933..67fb6a3834a3 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -722,9 +722,10 @@ EXPORT_SYMBOL(compat_mc_getsockopt);
 /* Argument list sizes for compat_sys_socketcall */
 #define AL(x) ((x) * sizeof(u32))
-static unsigned char nas[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
+static unsigned char nas[19]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
                                AL(3),AL(3),AL(4),AL(4),AL(4),AL(6),
-                                AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)};
+                                AL(6),AL(2),AL(5),AL(5),AL(3),AL(3),
+                                AL(6)};
 #undef AL
 asmlinkage long compat_sys_sendmsg(int fd, struct compat_msghdr __user *msg, unsigned flags)
@@ -737,13 +738,52 @@ asmlinkage long compat_sys_recvmsg(int fd, struct compat_msghdr __user *msg, uns
        return sys_recvmsg(fd, (struct msghdr __user *)msg, flags | MSG_CMSG_COMPAT);
 }
+asmlinkage long compat_sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
+                                   int __user *upeer_addrlen,
+                                   const compat_sigset_t __user *sigmask,
+                                   compat_size_t sigsetsize, int flags)
+{
+        compat_sigset_t ss32;
+        sigset_t ksigmask, sigsaved;
+        int ret;
+        if (sigmask) {
+                if (sigsetsize != sizeof(compat_sigset_t))
+                        return -EINVAL;
+                if (copy_from_user(&ss32, sigmask, sizeof(ss32)))
+                        return -EFAULT;
+                sigset_from_compat(&ksigmask, &ss32);
+                sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));
+                sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
+        }
+        ret = do_accept(fd, upeer_sockaddr, upeer_addrlen, flags);
+        if (ret == -ERESTARTNOHAND) {
+                /*
+                 * Don't restore the signal mask yet. Let do_signal() deliver
+                 * the signal on the way back to userspace, before the signal
+                 * mask is restored.
+                 */
+                if (sigmask) {
+                        memcpy(&current->saved_sigmask, &sigsaved,
+                               sizeof(sigsaved));
+                        set_restore_sigmask();
+                }
+        } else if (sigmask)
+                sigprocmask(SIG_SETMASK, &sigsaved, NULL);
+        return ret;
+}
 asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
 {
        int ret;
        u32 a[6];
        u32 a0, a1;
-        if (call < SYS_SOCKET || call > SYS_RECVMSG)
+        if (call < SYS_SOCKET || call > SYS_PACCEPT)
                return -EINVAL;
        if (copy_from_user(a, args, nas[call]))
                return -EFAULT;
@@ -764,7 +804,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
                ret = sys_listen(a0, a1);
                break;
        case SYS_ACCEPT:
-                ret = sys_accept(a0, compat_ptr(a1), compat_ptr(a[2]));
+                ret = do_accept(a0, compat_ptr(a1), compat_ptr(a[2]), 0);
                break;
        case SYS_GETSOCKNAME:
                ret = sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2]));
@@ -804,6 +844,10 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
        case SYS_RECVMSG:
                ret = compat_sys_recvmsg(a0, compat_ptr(a1), a[2]);
                break;
+        case SYS_PACCEPT:
+                ret = compat_sys_paccept(a0, compat_ptr(a1), compat_ptr(a[2]),
+                                         compat_ptr(a[3]), a[4], a[5]);
+                break;
        default:
                ret = -EINVAL;
                break;
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 8a28fc93b724..dd61dcad6019 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -285,7 +285,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -315,7 +315,7 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
@@ -366,7 +366,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -402,7 +402,7 @@ static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
                for (; list; list=list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
diff --git a/net/core/dev.c b/net/core/dev.c
index cbc34c0db376..8d13a9b9f1df 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -261,7 +261,7 @@ static RAW_NOTIFIER_HEAD(netdev_chain);
 DEFINE_PER_CPU(struct softnet_data, softnet_data);
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
+#ifdef CONFIG_LOCKDEP
 /*
 * register_netdevice() inits txq->_xmit_lock and sets lockdep class
 * according to dev->type
@@ -301,6 +301,7 @@ static const char *netdev_lock_name[] =
         "_xmit_NONE"};
 static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)];
+static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)];
 static inline unsigned short netdev_lock_pos(unsigned short dev_type)
 {
@@ -313,8 +314,8 @@ static inline unsigned short netdev_lock_pos(unsigned short dev_type)
        return ARRAY_SIZE(netdev_lock_type) - 1;
 }
-static inline void netdev_set_lockdep_class(spinlock_t *lock,
+static inline void netdev_set_xmit_lockdep_class(spinlock_t *lock,
-                                            unsigned short dev_type)
+                                                 unsigned short dev_type)
 {
        int i;
@@ -322,9 +323,22 @@ static inline void netdev_set_lockdep_class(spinlock_t *lock,
        lockdep_set_class_and_name(lock, &netdev_xmit_lock_key[i],
                                   netdev_lock_name[i]);
 }
+static inline void netdev_set_addr_lockdep_class(struct net_device *dev)
+{
+        int i;
+        i = netdev_lock_pos(dev->type);
+        lockdep_set_class_and_name(&dev->addr_list_lock,
+                                   &netdev_addr_lock_key[i],
+                                   netdev_lock_name[i]);
+}
 #else
-static inline void netdev_set_lockdep_class(spinlock_t *lock,
+static inline void netdev_set_xmit_lockdep_class(spinlock_t *lock,
-                                            unsigned short dev_type)
+                                                 unsigned short dev_type)
+{
+}
+static inline void netdev_set_addr_lockdep_class(struct net_device *dev)
 {
 }
 #endif
@@ -1327,9 +1341,6 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 void __netif_schedule(struct Qdisc *q)
 {
-        if (WARN_ON_ONCE(q == &noop_qdisc))
-                return;
        if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) {
                struct softnet_data *sd;
                unsigned long flags;
@@ -1645,32 +1656,6 @@ out_kfree_skb:
        return 0;
 }
-/**
- *      dev_queue_xmit - transmit a buffer
- *      @skb: buffer to transmit
- *
- *      Queue a buffer for transmission to a network device. The caller must
- *      have set the device and priority and built the buffer before calling
- *      this function. The function can be called from an interrupt.
- *
- *      A negative errno code is returned on a failure. A success does not
- *      guarantee the frame will be transmitted as it may be dropped due
- *      to congestion or traffic shaping.
- *
- * -----------------------------------------------------------------------------------
- *      I notice this method can also return errors from the queue disciplines,
- *      including NET_XMIT_DROP, which is a positive value.  So, errors can also
- *      be positive.
- *
- *      Regardless of the return value, the skb is consumed, so it is currently
- *      difficult to retry a send to this method.  (You can bump the ref count
- *      before sending to hold a reference for retry if you are careful.)
- *
- *      When calling this method, interrupts MUST be enabled.  This is because
- *      the BH enable code must have IRQs enabled so that it will not deadlock.
- *          --BLG
- */
 static u32 simple_tx_hashrnd;
 static int simple_tx_hashrnd_initialized = 0;
@@ -1738,6 +1723,31 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
        return netdev_get_tx_queue(dev, queue_index);
 }
+/**
+ *      dev_queue_xmit - transmit a buffer
+ *      @skb: buffer to transmit
+ *
+ *      Queue a buffer for transmission to a network device. The caller must
+ *      have set the device and priority and built the buffer before calling
+ *      this function. The function can be called from an interrupt.
+ *
+ *      A negative errno code is returned on a failure. A success does not
+ *      guarantee the frame will be transmitted as it may be dropped due
+ *      to congestion or traffic shaping.
+ *
+ * -----------------------------------------------------------------------------------
+ *      I notice this method can also return errors from the queue disciplines,
+ *      including NET_XMIT_DROP, which is a positive value.  So, errors can also
+ *      be positive.
+ *
+ *      Regardless of the return value, the skb is consumed, so it is currently
+ *      difficult to retry a send to this method.  (You can bump the ref count
+ *      before sending to hold a reference for retry if you are careful.)
+ *
+ *      When calling this method, interrupts MUST be enabled.  This is because
+ *      the BH enable code must have IRQs enabled so that it will not deadlock.
+ *          --BLG
+ */
 int dev_queue_xmit(struct sk_buff *skb)
 {
        struct net_device *dev = skb->dev;
@@ -1963,7 +1973,7 @@ static void net_tx_action(struct softirq_action *h)
                        struct sk_buff *skb = clist;
                        clist = clist->next;
-                        BUG_TRAP(!atomic_read(&skb->users));
+                        WARN_ON(atomic_read(&skb->users));
                        __kfree_skb(skb);
                }
        }
@@ -2385,7 +2395,7 @@ out:
         */
        if (!cpus_empty(net_dma.channel_mask)) {
                int chan_idx;
-                for_each_cpu_mask(chan_idx, net_dma.channel_mask) {
+                for_each_cpu_mask_nr(chan_idx, net_dma.channel_mask) {
                        struct dma_chan *chan = net_dma.channels[chan_idx];
                        if (chan)
                                dma_async_memcpy_issue_pending(chan);
@@ -3837,7 +3847,7 @@ static void rollback_registered(struct net_device *dev)
                dev->uninit(dev);
        /* Notifier chain MUST detach us from master device. */
-        BUG_TRAP(!dev->master);
+        WARN_ON(dev->master);
        /* Remove entries from kobject tree */
        netdev_unregister_kobject(dev);
@@ -3852,7 +3862,7 @@ static void __netdev_init_queue_locks_one(struct net_device *dev,
                                          void *_unused)
 {
        spin_lock_init(&dev_queue->_xmit_lock);
-        netdev_set_lockdep_class(&dev_queue->_xmit_lock, dev->type);
+        netdev_set_xmit_lockdep_class(&dev_queue->_xmit_lock, dev->type);
        dev_queue->xmit_lock_owner = -1;
 }
@@ -3897,6 +3907,7 @@ int register_netdevice(struct net_device *dev)
        net = dev_net(dev);
        spin_lock_init(&dev->addr_list_lock);
+        netdev_set_addr_lockdep_class(dev);
        netdev_init_queue_locks(dev);
        dev->iflink = -1;
@@ -4158,9 +4169,9 @@ void netdev_run_todo(void)
                /* paranoia */
                BUG_ON(atomic_read(&dev->refcnt));
-                BUG_TRAP(!dev->ip_ptr);
+                WARN_ON(dev->ip_ptr);
-                BUG_TRAP(!dev->ip6_ptr);
+                WARN_ON(dev->ip6_ptr);
-                BUG_TRAP(!dev->dn_ptr);
+                WARN_ON(dev->dn_ptr);
                if (dev->destructor)
                        dev->destructor(dev);
@@ -4207,7 +4218,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
 {
        struct netdev_queue *tx;
        struct net_device *dev;
-        int alloc_size;
+        size_t alloc_size;
        void *p;
        BUG_ON(strlen(name) >= sizeof(dev->name));
@@ -4227,7 +4238,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
                return NULL;
        }
-        tx = kzalloc(sizeof(struct netdev_queue) * queue_count, GFP_KERNEL);
+        tx = kcalloc(queue_count, sizeof(struct netdev_queue), GFP_KERNEL);
        if (!tx) {
                printk(KERN_ERR "alloc_netdev: Unable to allocate "
                       "tx qdiscs.\n");
@@ -4519,7 +4530,7 @@ static void net_dma_rebalance(struct net_dma *net_dma)
        i = 0;
        cpu = first_cpu(cpu_online_map);
-        for_each_cpu_mask(chan_idx, net_dma->channel_mask) {
+        for_each_cpu_mask_nr(chan_idx, net_dma->channel_mask) {
                chan = net_dma->channels[chan_idx];
                n = ((num_online_cpus() / cpus_weight(net_dma->channel_mask))
@@ -4686,6 +4697,26 @@ err_name:
        return -ENOMEM;
 }
+char *netdev_drivername(struct net_device *dev, char *buffer, int len)
+{
+        struct device_driver *driver;
+        struct device *parent;
+        if (len <= 0 || !buffer)
+                return buffer;
+        buffer[0] = 0;
+        parent = dev->dev.parent;
+        if (!parent)
+                return buffer;
+        driver = parent->driver;
+        if (driver && driver->name)
+                strlcpy(buffer, driver->name, len);
+        return buffer;
+}
 static void __net_exit netdev_exit(struct net *net)
 {
        kfree(net->dev_name_head);
diff --git a/net/core/request_sock.c b/net/core/request_sock.c
index 2d3035d3abd7..7552495aff7a 100644
--- a/net/core/request_sock.c
+++ b/net/core/request_sock.c
@@ -123,7 +123,7 @@ void reqsk_queue_destroy(struct request_sock_queue *queue)
                }
        }
-        BUG_TRAP(lopt->qlen == 0);
+        WARN_ON(lopt->qlen != 0);
        if (lopt_size > PAGE_SIZE)
                vfree(lopt);
        else
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index e4115672b6cf..4e0c92274189 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1200,7 +1200,7 @@ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len)
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -1229,7 +1229,7 @@ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len)
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
@@ -1475,7 +1475,7 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len)
                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + frag->size;
                if ((copy = end - offset) > 0) {
@@ -1503,7 +1503,7 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len)
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
@@ -1552,7 +1552,7 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -1581,7 +1581,7 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
@@ -1629,7 +1629,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -1662,7 +1662,7 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,
                        __wsum csum2;
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
@@ -2373,7 +2373,7 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -2397,7 +2397,7 @@ __skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len)
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
diff --git a/net/core/sock.c b/net/core/sock.c
index 10a64d57078c..91f8bbc93526 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -180,7 +180,7 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = {
  "clock-AF_ASH"   , "clock-AF_ECONET"   , "clock-AF_ATMSVC"   ,
  "clock-21"       , "clock-AF_SNA"      , "clock-AF_IRDA"     ,
  "clock-AF_PPPOX" , "clock-AF_WANPIPE"  , "clock-AF_LLC"      ,
-  "clock-27"       , "clock-28"          , "clock-29"          ,
+  "clock-27"       , "clock-28"          , "clock-AF_CAN"      ,
  "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,
  "clock-AF_RXRPC" , "clock-AF_MAX"
 };
diff --git a/net/core/stream.c b/net/core/stream.c
index 4a0ad152c9c4..a6b3437ff082 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -192,13 +192,13 @@ void sk_stream_kill_queues(struct sock *sk)
        __skb_queue_purge(&sk->sk_error_queue);
        /* Next, the write queue. */
-        BUG_TRAP(skb_queue_empty(&sk->sk_write_queue));
+        WARN_ON(!skb_queue_empty(&sk->sk_write_queue));
        /* Account for returned memory. */
        sk_mem_reclaim(sk);
-        BUG_TRAP(!sk->sk_wmem_queued);
+        WARN_ON(sk->sk_wmem_queued);
-        BUG_TRAP(!sk->sk_forward_alloc);
+        WARN_ON(sk->sk_forward_alloc);
        /* It is _impossible_ for the backlog to contain anything
         * when we get here.  All user references to this socket
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index a570e2af22cb..f686467ff12b 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -67,7 +67,7 @@ static struct ctl_table net_core_table[] = {
        {
                .ctl_name       = NET_CORE_MSG_COST,
                .procname       = "message_cost",
-                .data           = &net_msg_cost,
+                .data           = &net_ratelimit_state.interval,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
@@ -76,7 +76,7 @@ static struct ctl_table net_core_table[] = {
        {
                .ctl_name       = NET_CORE_MSG_BURST,
                .procname       = "message_burst",
-                .data           = &net_msg_burst,
+                .data           = &net_ratelimit_state.burst,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
diff --git a/net/core/user_dma.c b/net/core/user_dma.c
index c77aff9c6eb3..164b090d5ac3 100644
--- a/net/core/user_dma.c
+++ b/net/core/user_dma.c
@@ -27,13 +27,13 @@
 #include <linux/dmaengine.h>
 #include <linux/socket.h>
-#include <linux/rtnetlink.h> /* for BUG_TRAP */
 #include <net/tcp.h>
 #include <net/netdma.h>
 #define NET_DMA_DEFAULT_COPYBREAK 4096
 int sysctl_tcp_dma_copybreak = NET_DMA_DEFAULT_COPYBREAK;
+EXPORT_SYMBOL(sysctl_tcp_dma_copybreak);
 /**
 *      dma_skb_copy_datagram_iovec - Copy a datagram to an iovec.
@@ -71,7 +71,7 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                copy = end - offset;
@@ -100,7 +100,7 @@ int dma_skb_copy_datagram_iovec(struct dma_chan *chan,
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        copy = end - offset;
diff --git a/net/core/utils.c b/net/core/utils.c
index 8031eb59054e..72e0ebe964a0 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -31,17 +31,16 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
-int net_msg_cost __read_mostly = 5*HZ;
-int net_msg_burst __read_mostly = 10;
 int net_msg_warn __read_mostly = 1;
 EXPORT_SYMBOL(net_msg_warn);
+DEFINE_RATELIMIT_STATE(net_ratelimit_state, 5 * HZ, 10);
 /*
 * All net warning printk()s should be guarded by this function.
 */
 int net_ratelimit(void)
 {
-        return __printk_ratelimit(net_msg_cost, net_msg_burst);
+        return __ratelimit(&net_ratelimit_state);
 }
 EXPORT_SYMBOL(net_ratelimit);
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 32617e0576cb..743d85fcd651 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -164,7 +164,7 @@ static inline bool dccp_loss_free(const u64 s1, const u64 s2, const u64 ndp)
 {
        s64 delta = dccp_delta_seqno(s1, s2);
-        BUG_TRAP(delta >= 0);
+        WARN_ON(delta < 0);
        return (u64)delta <= ndp + 1;
 }
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 08392ed86c25..df2f110df94a 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -413,7 +413,7 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
                /* Stop the REQUEST timer */
                inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);
-                BUG_TRAP(sk->sk_send_head != NULL);
+                WARN_ON(sk->sk_send_head == NULL);
                __kfree_skb(sk->sk_send_head);
                sk->sk_send_head = NULL;
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 2622ace17c46..a835b88237cb 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -283,7 +283,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
                 * ICMPs are not backlogged, hence we cannot get an established
                 * socket here.
                 */
-                BUG_TRAP(!req->sk);
+                WARN_ON(req->sk);
                if (seq != dccp_rsk(req)->dreq_iss) {
                        NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index b74e8b2cbe55..da509127e00c 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -186,7 +186,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 * ICMPs are not backlogged, hence we cannot get an established
                 * socket here.
                 */
-                BUG_TRAP(req->sk == NULL);
+                WARN_ON(req->sk != NULL);
                if (seq != dccp_rsk(req)->dreq_iss) {
                        NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index a0b56009611f..b622d9744856 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -327,7 +327,7 @@ int dccp_disconnect(struct sock *sk, int flags)
        inet_csk_delack_init(sk);
        __sk_dst_reset(sk);
-        BUG_TRAP(!inet->num || icsk->icsk_bind_hash);
+        WARN_ON(inet->num && !icsk->icsk_bind_hash);
        sk->sk_error_report(sk);
        return err;
@@ -981,7 +981,7 @@ adjudge_to_death:
         */
        local_bh_disable();
        bh_lock_sock(sk);
-        BUG_TRAP(!sock_owned_by_user(sk));
+        WARN_ON(sock_owned_by_user(sk));
        /* Have we already been destroyed by a softirq or backlog? */
        if (state != DCCP_CLOSED && sk->sk_state == DCCP_CLOSED)
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 3608d5342ca2..6a5b961b6f5c 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -106,7 +106,7 @@ static void dccp_retransmit_timer(struct sock *sk)
         *      -- Acks     in client-PARTOPEN state (sec. 8.1.5)
         *      -- CloseReq in server-CLOSEREQ state (sec. 8.3)
         *      -- Close    in   node-CLOSING  state (sec. 8.3)                */
-        BUG_TRAP(sk->sk_send_head != NULL);
+        WARN_ON(sk->sk_send_head == NULL);
        /*
         * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 4670683b4688..591ea23639ca 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -356,10 +356,8 @@ config INET_ESP
 config INET_IPCOMP
        tristate "IP: IPComp transformation"
-        select XFRM
        select INET_XFRM_TUNNEL
-        select CRYPTO
+        select XFRM_IPCOMP
-        select CRYPTO_DEFLATE
        ---help---
          Support for IP Payload Compression Protocol (IPComp) (RFC3173),
          typically needed for IPsec.
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index dd919d84285f..8a3ac1fa71a9 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -148,10 +148,10 @@ void inet_sock_destruct(struct sock *sk)
                return;
        }
-        BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_rmem_alloc));
-        BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_wmem_alloc));
-        BUG_TRAP(!sk->sk_wmem_queued);
+        WARN_ON(sk->sk_wmem_queued);
-        BUG_TRAP(!sk->sk_forward_alloc);
+        WARN_ON(sk->sk_forward_alloc);
        kfree(inet->opt);
        dst_release(sk->sk_dst_cache);
@@ -264,7 +264,6 @@ static inline int inet_netns_ok(struct net *net, int protocol)
 static int inet_create(struct net *net, struct socket *sock, int protocol)
 {
        struct sock *sk;
-        struct list_head *p;
        struct inet_protosw *answer;
        struct inet_sock *inet;
        struct proto *answer_prot;
@@ -281,13 +280,12 @@ static int inet_create(struct net *net, struct socket *sock, int protocol)
        sock->state = SS_UNCONNECTED;
        /* Look for the requested type/protocol pair. */
-        answer = NULL;
 lookup_protocol:
        err = -ESOCKTNOSUPPORT;
        rcu_read_lock();
-        list_for_each_rcu(p, &inetsw[sock->type]) {
+        list_for_each_entry_rcu(answer, &inetsw[sock->type], list) {
-                answer = list_entry(p, struct inet_protosw, list);
+                err = 0;
                /* Check the non-wild match. */
                if (protocol == answer->protocol) {
                        if (protocol != IPPROTO_IP)
@@ -302,10 +300,9 @@ lookup_protocol:
                                break;
                }
                err = -EPROTONOSUPPORT;
-                answer = NULL;
        }
-        if (unlikely(answer == NULL)) {
+        if (unlikely(err)) {
                if (try_loading_module < 2) {
                        rcu_read_unlock();
                        /*
@@ -341,7 +338,7 @@ lookup_protocol:
        answer_flags = answer->flags;
        rcu_read_unlock();
-        BUG_TRAP(answer_prot->slab != NULL);
+        WARN_ON(answer_prot->slab == NULL);
        err = -ENOBUFS;
        sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot);
@@ -661,8 +658,8 @@ int inet_accept(struct socket *sock, struct socket *newsock, int flags)
        lock_sock(sk2);
-        BUG_TRAP((1 << sk2->sk_state) &
+        WARN_ON(!((1 << sk2->sk_state) &
-                 (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_CLOSE));
+                  (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_CLOSE)));
        sock_graft(sk2, newsock);
@@ -1442,6 +1439,10 @@ static int __init inet_init(void)
        (void)sock_register(&inet_family_ops);
+#ifdef CONFIG_SYSCTL
+        ip_static_sysctl_init();
+#endif
        /*
         *      Add all the base protocols.
         */
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 2e667e2f90df..91d3d96805d0 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -138,8 +138,8 @@ void in_dev_finish_destroy(struct in_device *idev)
 {
        struct net_device *dev = idev->dev;
-        BUG_TRAP(!idev->ifa_list);
+        WARN_ON(idev->ifa_list);
-        BUG_TRAP(!idev->mc_list);
+        WARN_ON(idev->mc_list);
 #ifdef NET_REFCNT_DEBUG
        printk(KERN_DEBUG "in_dev_finish_destroy: %p=%s\n",
               idev, dev ? dev->name : "NIL");
@@ -399,7 +399,7 @@ static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
        }
        ipv4_devconf_setall(in_dev);
        if (ifa->ifa_dev != in_dev) {
-                BUG_TRAP(!ifa->ifa_dev);
+                WARN_ON(ifa->ifa_dev);
                in_dev_hold(in_dev);
                ifa->ifa_dev = in_dev;
        }
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index bb81c958b744..0c1ae68ee84b 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -167,7 +167,7 @@ tb_not_found:
 success:
        if (!inet_csk(sk)->icsk_bind_hash)
                inet_bind_hash(sk, tb, snum);
-        BUG_TRAP(inet_csk(sk)->icsk_bind_hash == tb);
+        WARN_ON(inet_csk(sk)->icsk_bind_hash != tb);
        ret = 0;
 fail_unlock:
@@ -260,7 +260,7 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err)
        }
        newsk = reqsk_queue_get_child(&icsk->icsk_accept_queue, sk);
-        BUG_TRAP(newsk->sk_state != TCP_SYN_RECV);
+        WARN_ON(newsk->sk_state == TCP_SYN_RECV);
 out:
        release_sock(sk);
        return newsk;
@@ -386,7 +386,7 @@ struct request_sock *inet_csk_search_req(const struct sock *sk,
                    ireq->rmt_addr == raddr &&
                    ireq->loc_addr == laddr &&
                    AF_INET_FAMILY(req->rsk_ops->family)) {
-                        BUG_TRAP(!req->sk);
+                        WARN_ON(req->sk);
                        *prevp = prev;
                        break;
                }
@@ -539,14 +539,14 @@ EXPORT_SYMBOL_GPL(inet_csk_clone);
 */
 void inet_csk_destroy_sock(struct sock *sk)
 {
-        BUG_TRAP(sk->sk_state == TCP_CLOSE);
+        WARN_ON(sk->sk_state != TCP_CLOSE);
-        BUG_TRAP(sock_flag(sk, SOCK_DEAD));
+        WARN_ON(!sock_flag(sk, SOCK_DEAD));
        /* It cannot be in hash table! */
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
        /* If it has not 0 inet_sk(sk)->num, it must be bound */
-        BUG_TRAP(!inet_sk(sk)->num || inet_csk(sk)->icsk_bind_hash);
+        WARN_ON(inet_sk(sk)->num && !inet_csk(sk)->icsk_bind_hash);
        sk->sk_prot->destroy(sk);
@@ -629,7 +629,7 @@ void inet_csk_listen_stop(struct sock *sk)
                local_bh_disable();
                bh_lock_sock(child);
-                BUG_TRAP(!sock_owned_by_user(child));
+                WARN_ON(sock_owned_by_user(child));
                sock_hold(child);
                sk->sk_prot->disconnect(child, O_NONBLOCK);
@@ -647,7 +647,7 @@ void inet_csk_listen_stop(struct sock *sk)
                sk_acceptq_removed(sk);
                __reqsk_free(req);
        }
-        BUG_TRAP(!sk->sk_ack_backlog);
+        WARN_ON(sk->sk_ack_backlog);
 }
 EXPORT_SYMBOL_GPL(inet_csk_listen_stop);
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 0546a0bc97ea..6c52e08f786e 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -134,8 +134,8 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f,
        struct sk_buff *fp;
        struct netns_frags *nf;
-        BUG_TRAP(q->last_in & INET_FRAG_COMPLETE);
+        WARN_ON(!(q->last_in & INET_FRAG_COMPLETE));
-        BUG_TRAP(del_timer(&q->timer) == 0);
+        WARN_ON(del_timer(&q->timer) != 0);
        /* Release all fragment data. */
        fp = q->fragments;
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 115f53722d20..44981906fb91 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -305,7 +305,7 @@ unique:
        inet->num = lport;
        inet->sport = htons(lport);
        sk->sk_hash = hash;
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
        __sk_add_node(sk, &head->chain);
        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
        write_unlock(lock);
@@ -342,7 +342,7 @@ void __inet_hash_nolisten(struct sock *sk)
        rwlock_t *lock;
        struct inet_ehash_bucket *head;
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
        sk->sk_hash = inet_sk_ehashfn(sk);
        head = inet_ehash_bucket(hashinfo, sk->sk_hash);
@@ -367,7 +367,7 @@ static void __inet_hash(struct sock *sk)
                return;
        }
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
        list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
        lock = &hashinfo->lhash_lock;
@@ -450,7 +450,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,
                         */
                        inet_bind_bucket_for_each(tb, node, &head->chain) {
                                if (tb->ib_net == net && tb->port == port) {
-                                        BUG_TRAP(!hlist_empty(&tb->owners));
+                                        WARN_ON(hlist_empty(&tb->owners));
                                        if (tb->fastreuse >= 0)
                                                goto next_port;
                                        if (!check_established(death_row, sk,
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
index 75c2def8f9a0..d985bd613d25 100644
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -86,7 +86,7 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk,
                        hashinfo->bhash_size)];
        spin_lock(&bhead->lock);
        tw->tw_tb = icsk->icsk_bind_hash;
-        BUG_TRAP(icsk->icsk_bind_hash);
+        WARN_ON(!icsk->icsk_bind_hash);
        inet_twsk_add_bind_node(tw, &tw->tw_tb->owners);
        spin_unlock(&bhead->lock);
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 38d38f058018..2152d222b954 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -488,8 +488,8 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
                qp->q.fragments = head;
        }
-        BUG_TRAP(head != NULL);
+        WARN_ON(head == NULL);
-        BUG_TRAP(FRAG_CB(head)->offset == 0);
+        WARN_ON(FRAG_CB(head)->offset != 0);
        /* Allocate a new buffer for the datagram. */
        ihlen = ip_hdrlen(head);
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 465544f6281a..d533a89e08de 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -118,7 +118,7 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb)
        __skb_pull(newskb, skb_network_offset(newskb));
        newskb->pkt_type = PACKET_LOOPBACK;
        newskb->ip_summed = CHECKSUM_UNNECESSARY;
-        BUG_TRAP(newskb->dst);
+        WARN_ON(!newskb->dst);
        netif_rx(newskb);
        return 0;
 }
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index a75807b971b3..a42b64d040c4 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -14,153 +14,14 @@
 *   - Adaptive compression.
 */
 #include <linux/module.h>
-#include <linux/crypto.h>
 #include <linux/err.h>
-#include <linux/pfkeyv2.h>
-#include <linux/percpu.h>
-#include <linux/smp.h>
-#include <linux/list.h>
-#include <linux/vmalloc.h>
 #include <linux/rtnetlink.h>
-#include <linux/mutex.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/icmp.h>
 #include <net/ipcomp.h>
 #include <net/protocol.h>
+#include <net/sock.h>
-struct ipcomp_tfms {
-        struct list_head list;
-        struct crypto_comp **tfms;
-        int users;
-};
-static DEFINE_MUTEX(ipcomp_resource_mutex);
-static void **ipcomp_scratches;
-static int ipcomp_scratch_users;
-static LIST_HEAD(ipcomp_tfms_list);
-static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct ipcomp_data *ipcd = x->data;
-        const int plen = skb->len;
-        int dlen = IPCOMP_SCRATCH_SIZE;
-        const u8 *start = skb->data;
-        const int cpu = get_cpu();
-        u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
-        struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
-        int err = crypto_comp_decompress(tfm, start, plen, scratch, &dlen);
-        if (err)
-                goto out;
-        if (dlen < (plen + sizeof(struct ip_comp_hdr))) {
-                err = -EINVAL;
-                goto out;
-        }
-        err = pskb_expand_head(skb, 0, dlen - plen, GFP_ATOMIC);
-        if (err)
-                goto out;
-        skb->truesize += dlen - plen;
-        __skb_put(skb, dlen - plen);
-        skb_copy_to_linear_data(skb, scratch, dlen);
-out:
-        put_cpu();
-        return err;
-}
-static int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int nexthdr;
-        int err = -ENOMEM;
-        struct ip_comp_hdr *ipch;
-        if (skb_linearize_cow(skb))
-                goto out;
-        skb->ip_summed = CHECKSUM_NONE;
-        /* Remove ipcomp header and decompress original payload */
-        ipch = (void *)skb->data;
-        nexthdr = ipch->nexthdr;
-        skb->transport_header = skb->network_header + sizeof(*ipch);
-        __skb_pull(skb, sizeof(*ipch));
-        err = ipcomp_decompress(x, skb);
-        if (err)
-                goto out;
-        err = nexthdr;
-out:
-        return err;
-}
-static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct ipcomp_data *ipcd = x->data;
-        const int plen = skb->len;
-        int dlen = IPCOMP_SCRATCH_SIZE;
-        u8 *start = skb->data;
-        const int cpu = get_cpu();
-        u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
-        struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
-        int err;
-        local_bh_disable();
-        err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
-        local_bh_enable();
-        if (err)
-                goto out;
-        if ((dlen + sizeof(struct ip_comp_hdr)) >= plen) {
-                err = -EMSGSIZE;
-                goto out;
-        }
-        memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen);
-        put_cpu();
-        pskb_trim(skb, dlen + sizeof(struct ip_comp_hdr));
-        return 0;
-out:
-        put_cpu();
-        return err;
-}
-static int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int err;
-        struct ip_comp_hdr *ipch;
-        struct ipcomp_data *ipcd = x->data;
-        if (skb->len < ipcd->threshold) {
-                /* Don't bother compressing */
-                goto out_ok;
-        }
-        if (skb_linearize_cow(skb))
-                goto out_ok;
-        err = ipcomp_compress(x, skb);
-        if (err) {
-                goto out_ok;
-        }
-        /* Install ipcomp header, convert into ipcomp datagram. */
-        ipch = ip_comp_hdr(skb);
-        ipch->nexthdr = *skb_mac_header(skb);
-        ipch->flags = 0;
-        ipch->cpi = htons((u16 )ntohl(x->id.spi));
-        *skb_mac_header(skb) = IPPROTO_COMP;
-out_ok:
-        skb_push(skb, -skb_network_offset(skb));
-        return 0;
-}
 static void ipcomp4_err(struct sk_buff *skb, u32 info)
 {
@@ -241,156 +102,12 @@ out:
        return err;
 }
-static void ipcomp_free_scratches(void)
+static int ipcomp4_init_state(struct xfrm_state *x)
-{
-        int i;
-        void **scratches;
-        if (--ipcomp_scratch_users)
-                return;
-        scratches = ipcomp_scratches;
-        if (!scratches)
-                return;
-        for_each_possible_cpu(i)
-                vfree(*per_cpu_ptr(scratches, i));
-        free_percpu(scratches);
-}
-static void **ipcomp_alloc_scratches(void)
-{
-        int i;
-        void **scratches;
-        if (ipcomp_scratch_users++)
-                return ipcomp_scratches;
-        scratches = alloc_percpu(void *);
-        if (!scratches)
-                return NULL;
-        ipcomp_scratches = scratches;
-        for_each_possible_cpu(i) {
-                void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
-                if (!scratch)
-                        return NULL;
-                *per_cpu_ptr(scratches, i) = scratch;
-        }
-        return scratches;
-}
-static void ipcomp_free_tfms(struct crypto_comp **tfms)
-{
-        struct ipcomp_tfms *pos;
-        int cpu;
-        list_for_each_entry(pos, &ipcomp_tfms_list, list) {
-                if (pos->tfms == tfms)
-                        break;
-        }
-        BUG_TRAP(pos);
-        if (--pos->users)
-                return;
-        list_del(&pos->list);
-        kfree(pos);
-        if (!tfms)
-                return;
-        for_each_possible_cpu(cpu) {
-                struct crypto_comp *tfm = *per_cpu_ptr(tfms, cpu);
-                crypto_free_comp(tfm);
-        }
-        free_percpu(tfms);
-}
-static struct crypto_comp **ipcomp_alloc_tfms(const char *alg_name)
-{
-        struct ipcomp_tfms *pos;
-        struct crypto_comp **tfms;
-        int cpu;
-        /* This can be any valid CPU ID so we don't need locking. */
-        cpu = raw_smp_processor_id();
-        list_for_each_entry(pos, &ipcomp_tfms_list, list) {
-                struct crypto_comp *tfm;
-                tfms = pos->tfms;
-                tfm = *per_cpu_ptr(tfms, cpu);
-                if (!strcmp(crypto_comp_name(tfm), alg_name)) {
-                        pos->users++;
-                        return tfms;
-                }
-        }
-        pos = kmalloc(sizeof(*pos), GFP_KERNEL);
-        if (!pos)
-                return NULL;
-        pos->users = 1;
-        INIT_LIST_HEAD(&pos->list);
-        list_add(&pos->list, &ipcomp_tfms_list);
-        pos->tfms = tfms = alloc_percpu(struct crypto_comp *);
-        if (!tfms)
-                goto error;
-        for_each_possible_cpu(cpu) {
-                struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,
-                                                            CRYPTO_ALG_ASYNC);
-                if (IS_ERR(tfm))
-                        goto error;
-                *per_cpu_ptr(tfms, cpu) = tfm;
-        }
-        return tfms;
-error:
-        ipcomp_free_tfms(tfms);
-        return NULL;
-}
-static void ipcomp_free_data(struct ipcomp_data *ipcd)
-{
-        if (ipcd->tfms)
-                ipcomp_free_tfms(ipcd->tfms);
-        ipcomp_free_scratches();
-}
-static void ipcomp_destroy(struct xfrm_state *x)
-{
-        struct ipcomp_data *ipcd = x->data;
-        if (!ipcd)
-                return;
-        xfrm_state_delete_tunnel(x);
-        mutex_lock(&ipcomp_resource_mutex);
-        ipcomp_free_data(ipcd);
-        mutex_unlock(&ipcomp_resource_mutex);
-        kfree(ipcd);
-}
-static int ipcomp_init_state(struct xfrm_state *x)
 {
        int err;
        struct ipcomp_data *ipcd;
        struct xfrm_algo_desc *calg_desc;
-        err = -EINVAL;
-        if (!x->calg)
-                goto out;
-        if (x->encap)
-                goto out;
        x->props.header_len = 0;
        switch (x->props.mode) {
        case XFRM_MODE_TRANSPORT:
@@ -402,40 +119,22 @@ static int ipcomp_init_state(struct xfrm_state *x)
                goto out;
        }
-        err = -ENOMEM;
+        err = ipcomp_init_state(x);
-        ipcd = kzalloc(sizeof(*ipcd), GFP_KERNEL);
+        if (err)
-        if (!ipcd)
                goto out;
-        mutex_lock(&ipcomp_resource_mutex);
-        if (!ipcomp_alloc_scratches())
-                goto error;
-        ipcd->tfms = ipcomp_alloc_tfms(x->calg->alg_name);
-        if (!ipcd->tfms)
-                goto error;
-        mutex_unlock(&ipcomp_resource_mutex);
        if (x->props.mode == XFRM_MODE_TUNNEL) {
                err = ipcomp_tunnel_attach(x);
                if (err)
                        goto error_tunnel;
        }
-        calg_desc = xfrm_calg_get_byname(x->calg->alg_name, 0);
-        BUG_ON(!calg_desc);
-        ipcd->threshold = calg_desc->uinfo.comp.threshold;
-        x->data = ipcd;
        err = 0;
 out:
        return err;
 error_tunnel:
-        mutex_lock(&ipcomp_resource_mutex);
+        ipcomp_destroy(x);
-error:
-        ipcomp_free_data(ipcd);
-        mutex_unlock(&ipcomp_resource_mutex);
-        kfree(ipcd);
        goto out;
 }
@@ -443,7 +142,7 @@ static const struct xfrm_type ipcomp_type = {
        .description    = "IPCOMP4",
        .owner          = THIS_MODULE,
        .proto          = IPPROTO_COMP,
-        .init_state     = ipcomp_init_state,
+        .init_state     = ipcomp4_init_state,
        .destructor     = ipcomp_destroy,
        .input          = ipcomp_input,
        .output         = ipcomp_output
@@ -481,7 +180,7 @@ module_init(ipcomp4_init);
 module_exit(ipcomp4_fini);
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) - RFC3173");
+MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp/IPv4) - RFC3173");
 MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
 MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_COMP);
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index f23e60c93ef9..90eb7cb47e77 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -369,7 +369,7 @@ config IP_NF_SECURITY
        tristate "Security table"
        depends on IP_NF_IPTABLES
        depends on SECURITY
-        default m if NETFILTER_ADVANCED=n
+        depends on NETFILTER_ADVANCED
        help
          This option adds a `security' table to iptables, for use
          with Mandatory Access Control (MAC) policy.
diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c
index 3be4d07e7ed9..082f5dd3156c 100644
--- a/net/ipv4/netfilter/arptable_filter.c
+++ b/net/ipv4/netfilter/arptable_filter.c
@@ -55,32 +55,53 @@ static struct xt_table packet_filter = {
 };
 /* The work comes in here from netfilter.c */
-static unsigned int arpt_hook(unsigned int hook,
+static unsigned int arpt_in_hook(unsigned int hook,
-                              struct sk_buff *skb,
+                                 struct sk_buff *skb,
-                              const struct net_device *in,
+                                 const struct net_device *in,
-                              const struct net_device *out,
+                                 const struct net_device *out,
-                              int (*okfn)(struct sk_buff *))
+                                 int (*okfn)(struct sk_buff *))
 {
-        return arpt_do_table(skb, hook, in, out, init_net.ipv4.arptable_filter);
+        return arpt_do_table(skb, hook, in, out,
+                             dev_net(in)->ipv4.arptable_filter);
+}
+static unsigned int arpt_out_hook(unsigned int hook,
+                                  struct sk_buff *skb,
+                                  const struct net_device *in,
+                                  const struct net_device *out,
+                                  int (*okfn)(struct sk_buff *))
+{
+        return arpt_do_table(skb, hook, in, out,
+                             dev_net(out)->ipv4.arptable_filter);
+}
+static unsigned int arpt_forward_hook(unsigned int hook,
+                                      struct sk_buff *skb,
+                                      const struct net_device *in,
+                                      const struct net_device *out,
+                                      int (*okfn)(struct sk_buff *))
+{
+        return arpt_do_table(skb, hook, in, out,
+                             dev_net(in)->ipv4.arptable_filter);
 }
 static struct nf_hook_ops arpt_ops[] __read_mostly = {
        {
-                .hook           = arpt_hook,
+                .hook           = arpt_in_hook,
                .owner          = THIS_MODULE,
                .pf             = NF_ARP,
                .hooknum        = NF_ARP_IN,
                .priority       = NF_IP_PRI_FILTER,
        },
        {
-                .hook           = arpt_hook,
+                .hook           = arpt_out_hook,
                .owner          = THIS_MODULE,
                .pf             = NF_ARP,
                .hooknum        = NF_ARP_OUT,
                .priority       = NF_IP_PRI_FILTER,
        },
        {
-                .hook           = arpt_hook,
+                .hook           = arpt_forward_hook,
                .owner          = THIS_MODULE,
                .pf             = NF_ARP,
                .hooknum        = NF_ARP_FORWARD,
diff --git a/net/ipv4/netfilter/iptable_security.c b/net/ipv4/netfilter/iptable_security.c
index 2b472ac2263a..db6d312128e1 100644
--- a/net/ipv4/netfilter/iptable_security.c
+++ b/net/ipv4/netfilter/iptable_security.c
@@ -32,7 +32,7 @@ static struct
        struct ipt_replace repl;
        struct ipt_standard entries[3];
        struct ipt_error term;
-} initial_table __initdata = {
+} initial_table __net_initdata = {
        .repl = {
                .name = "security",
                .valid_hooks = SECURITY_VALID_HOOKS,
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index e4ab0ac94f92..380d6474cf66 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1502,7 +1502,7 @@ unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
                                    rth->fl.iif != 0 ||
                                    dst_metric_locked(&rth->u.dst, RTAX_MTU) ||
                                    !net_eq(dev_net(rth->u.dst.dev), net) ||
-                                    !rt_is_expired(rth))
+                                    rt_is_expired(rth))
                                        continue;
                                if (new_mtu < 68 || new_mtu >= old_mtu) {
@@ -2914,7 +2914,7 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table,
        return 0;
 }
-ctl_table ipv4_route_table[] = {
+static ctl_table ipv4_route_table[] = {
        {
                .ctl_name       = NET_IPV4_ROUTE_GC_THRESH,
                .procname       = "gc_thresh",
@@ -3216,6 +3216,15 @@ int __init ip_rt_init(void)
        return rc;
 }
+/*
+ * We really need to sanitize the damn ipv4 init order, then all
+ * this nonsense will go away.
+ */
+void __init ip_static_sysctl_init(void)
+{
+        register_sysctl_paths(ipv4_route_path, ipv4_route_table);
+}
 EXPORT_SYMBOL(__ip_select_ident);
 EXPORT_SYMBOL(ip_route_input);
 EXPORT_SYMBOL(ip_route_output_key);
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 51bc24d3b8a7..9d38005abbac 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -299,6 +299,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
        ireq->rmt_port          = th->source;
        ireq->loc_addr          = ip_hdr(skb)->daddr;
        ireq->rmt_addr          = ip_hdr(skb)->saddr;
+        ireq->ecn_ok            = 0;
        ireq->snd_wscale        = tcp_opt.snd_wscale;
        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
        ireq->sack_ok           = tcp_opt.sack_ok;
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 14ef202a2254..770d827f5ab8 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -401,13 +401,6 @@ static struct ctl_table ipv4_table[] = {
                .proc_handler   = &ipv4_local_port_range,
                .strategy       = &ipv4_sysctl_local_port_range,
        },
-        {
-                .ctl_name       = NET_IPV4_ROUTE,
-                .procname       = "route",
-                .maxlen         = 0,
-                .mode           = 0555,
-                .child          = ipv4_route_table
-        },
 #ifdef CONFIG_IP_MULTICAST
        {
                .ctl_name       = NET_IPV4_IGMP_MAX_MEMBERSHIPS,
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 0b491bf03db4..1ab341e5d3e0 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1096,7 +1096,7 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied)
 #if TCP_DEBUG
        struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
-        BUG_TRAP(!skb || before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq));
+        WARN_ON(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq));
 #endif
        if (inet_csk_ack_scheduled(sk)) {
@@ -1358,7 +1358,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                goto found_ok_skb;
                        if (tcp_hdr(skb)->fin)
                                goto found_fin_ok;
-                        BUG_TRAP(flags & MSG_PEEK);
+                        WARN_ON(!(flags & MSG_PEEK));
                        skb = skb->next;
                } while (skb != (struct sk_buff *)&sk->sk_receive_queue);
@@ -1421,8 +1421,8 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                        tp->ucopy.len = len;
-                        BUG_TRAP(tp->copied_seq == tp->rcv_nxt ||
+                        WARN_ON(tp->copied_seq != tp->rcv_nxt &&
-                                 (flags & (MSG_PEEK | MSG_TRUNC)));
+                                !(flags & (MSG_PEEK | MSG_TRUNC)));
                        /* Ugly... If prequeue is not empty, we have to
                         * process it before releasing socket, otherwise
@@ -1844,7 +1844,7 @@ adjudge_to_death:
         */
        local_bh_disable();
        bh_lock_sock(sk);
-        BUG_TRAP(!sock_owned_by_user(sk));
+        WARN_ON(sock_owned_by_user(sk));
        /* Have we already been destroyed by a softirq or backlog? */
        if (state != TCP_CLOSE && sk->sk_state == TCP_CLOSE)
@@ -1973,7 +1973,7 @@ int tcp_disconnect(struct sock *sk, int flags)
        memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
        __sk_dst_reset(sk);
-        BUG_TRAP(!inet->num || icsk->icsk_bind_hash);
+        WARN_ON(inet->num && !icsk->icsk_bind_hash);
        sk->sk_error_report(sk);
        return err;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1f5e6049883e..67ccce2a96bd 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1629,10 +1629,10 @@ advance_sp:
 out:
 #if FASTRETRANS_DEBUG > 0
-        BUG_TRAP((int)tp->sacked_out >= 0);
+        WARN_ON((int)tp->sacked_out < 0);
-        BUG_TRAP((int)tp->lost_out >= 0);
+        WARN_ON((int)tp->lost_out < 0);
-        BUG_TRAP((int)tp->retrans_out >= 0);
+        WARN_ON((int)tp->retrans_out < 0);
-        BUG_TRAP((int)tcp_packets_in_flight(tp) >= 0);
+        WARN_ON((int)tcp_packets_in_flight(tp) < 0);
 #endif
        return flag;
 }
@@ -2181,7 +2181,7 @@ static void tcp_mark_head_lost(struct sock *sk, int packets)
        int err;
        unsigned int mss;
-        BUG_TRAP(packets <= tp->packets_out);
+        WARN_ON(packets > tp->packets_out);
        if (tp->lost_skb_hint) {
                skb = tp->lost_skb_hint;
                cnt = tp->lost_cnt_hint;
@@ -2610,7 +2610,7 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked, int flag)
        /* E. Check state exit conditions. State can be terminated
         *    when high_seq is ACKed. */
        if (icsk->icsk_ca_state == TCP_CA_Open) {
-                BUG_TRAP(tp->retrans_out == 0);
+                WARN_ON(tp->retrans_out != 0);
                tp->retrans_stamp = 0;
        } else if (!before(tp->snd_una, tp->high_seq)) {
                switch (icsk->icsk_ca_state) {
@@ -2972,9 +2972,9 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets)
        }
 #if FASTRETRANS_DEBUG > 0
-        BUG_TRAP((int)tp->sacked_out >= 0);
+        WARN_ON((int)tp->sacked_out < 0);
-        BUG_TRAP((int)tp->lost_out >= 0);
+        WARN_ON((int)tp->lost_out < 0);
-        BUG_TRAP((int)tp->retrans_out >= 0);
+        WARN_ON((int)tp->retrans_out < 0);
        if (!tp->packets_out && tcp_is_sack(tp)) {
                icsk = inet_csk(sk);
                if (tp->lost_out) {
@@ -3292,6 +3292,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
         * log. Something worked...
         */
        sk->sk_err_soft = 0;
+        icsk->icsk_probes_out = 0;
        tp->rcv_tstamp = tcp_time_stamp;
        prior_packets = tp->packets_out;
        if (!prior_packets)
@@ -3324,8 +3325,6 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
        return 1;
 no_queue:
-        icsk->icsk_probes_out = 0;
        /* If this ack opens up a zero window, clear backoff.  It was
         * being used to time the probes, and is probably far higher than
         * it needs to be for normal retransmission.
@@ -3878,7 +3877,7 @@ static void tcp_sack_remove(struct tcp_sock *tp)
                        int i;
                        /* RCV.NXT must cover all the block! */
-                        BUG_TRAP(!before(tp->rcv_nxt, sp->end_seq));
+                        WARN_ON(before(tp->rcv_nxt, sp->end_seq));
                        /* Zap this SACK, by moving forward any other SACKS. */
                        for (i=this_sack+1; i < num_sacks; i++)
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a82df6307567..a2b06d0cc26b 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -418,7 +418,7 @@ void tcp_v4_err(struct sk_buff *skb, u32 info)
                /* ICMPs are not backlogged, hence we cannot get
                   an established socket here.
                 */
-                BUG_TRAP(!req->sk);
+                WARN_ON(req->sk);
                if (seq != tcp_rsk(req)->snt_isn) {
                        NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 1fa683c0ba9b..a00532de2a8c 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -472,7 +472,7 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
        }
        if (likely(sysctl_tcp_sack)) {
                opts->options |= OPTION_SACK_ADVERTISE;
-                if (unlikely(!OPTION_TS & opts->options))
+                if (unlikely(!(OPTION_TS & opts->options)))
                        size += TCPOLEN_SACKPERM_ALIGNED;
        }
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 328e0cf42b3c..5ab6ba19c3ce 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -287,7 +287,7 @@ static void tcp_retransmit_timer(struct sock *sk)
        if (!tp->packets_out)
                goto out;
-        BUG_TRAP(!tcp_write_queue_empty(sk));
+        WARN_ON(tcp_write_queue_empty(sk));
        if (!tp->snd_wnd && !sock_flag(sk, SOCK_DEAD) &&
            !((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))) {
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index a751770947a3..383d17359d01 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1325,6 +1325,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,
                        return -ENOPROTOOPT;
                if (val != 0 && val < 8) /* Illegal coverage: use default (8) */
                        val = 8;
+                else if (val > USHORT_MAX)
+                        val = USHORT_MAX;
                up->pcslen = val;
                up->pcflag |= UDPLITE_SEND_CC;
                break;
@@ -1337,6 +1339,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,
                        return -ENOPROTOOPT;
                if (val != 0 && val < 8) /* Avoid silly minimal values.       */
                        val = 8;
+                else if (val > USHORT_MAX)
+                        val = USHORT_MAX;
                up->pcrlen = val;
                up->pcflag |= UDPLITE_RECV_CC;
                break;
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 42814a2ec9d7..ec992159b5f8 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -96,10 +96,8 @@ config INET6_ESP
 config INET6_IPCOMP
        tristate "IPv6: IPComp transformation"
-        select XFRM
        select INET6_XFRM_TUNNEL
-        select CRYPTO
+        select XFRM_IPCOMP
-        select CRYPTO_DEFLATE
        ---help---
          Support for IP Payload Compression Protocol (IPComp) (RFC3173),
          typically needed for IPsec.
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 9f4fcce6379b..a7842c54f58a 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -153,7 +153,7 @@ static int ipv6_chk_same_addr(struct net *net, const struct in6_addr *addr,
 static ATOMIC_NOTIFIER_HEAD(inet6addr_chain);
-struct ipv6_devconf ipv6_devconf __read_mostly = {
+static struct ipv6_devconf ipv6_devconf __read_mostly = {
        .forwarding             = 0,
        .hop_limit              = IPV6_DEFAULT_HOPLIMIT,
        .mtu6                   = IPV6_MIN_MTU,
@@ -313,8 +313,10 @@ static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
 void in6_dev_finish_destroy(struct inet6_dev *idev)
 {
        struct net_device *dev = idev->dev;
-        BUG_TRAP(idev->addr_list==NULL);
-        BUG_TRAP(idev->mc_list==NULL);
+        WARN_ON(idev->addr_list != NULL);
+        WARN_ON(idev->mc_list != NULL);
 #ifdef NET_REFCNT_DEBUG
        printk(KERN_DEBUG "in6_dev_finish_destroy: %s\n", dev ? dev->name : "NIL");
 #endif
@@ -517,8 +519,9 @@ static void addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
 void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp)
 {
-        BUG_TRAP(ifp->if_next==NULL);
+        WARN_ON(ifp->if_next != NULL);
-        BUG_TRAP(ifp->lst_next==NULL);
+        WARN_ON(ifp->lst_next != NULL);
 #ifdef NET_REFCNT_DEBUG
        printk(KERN_DEBUG "inet6_ifa_finish_destroy\n");
 #endif
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 3d828bc4b1cf..95055f8c3f35 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -83,7 +83,6 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol)
        struct inet_sock *inet;
        struct ipv6_pinfo *np;
        struct sock *sk;
-        struct list_head *p;
        struct inet_protosw *answer;
        struct proto *answer_prot;
        unsigned char answer_flags;
@@ -97,13 +96,12 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol)
                build_ehash_secret();
        /* Look for the requested type/protocol pair. */
-        answer = NULL;
 lookup_protocol:
        err = -ESOCKTNOSUPPORT;
        rcu_read_lock();
-        list_for_each_rcu(p, &inetsw6[sock->type]) {
+        list_for_each_entry_rcu(answer, &inetsw6[sock->type], list) {
-                answer = list_entry(p, struct inet_protosw, list);
+                err = 0;
                /* Check the non-wild match. */
                if (protocol == answer->protocol) {
                        if (protocol != IPPROTO_IP)
@@ -118,10 +116,9 @@ lookup_protocol:
                                break;
                }
                err = -EPROTONOSUPPORT;
-                answer = NULL;
        }
-        if (!answer) {
+        if (err) {
                if (try_loading_module < 2) {
                        rcu_read_unlock();
                        /*
@@ -153,7 +150,7 @@ lookup_protocol:
        answer_flags = answer->flags;
        rcu_read_unlock();
-        BUG_TRAP(answer_prot->slab != NULL);
+        WARN_ON(answer_prot->slab == NULL);
        err = -ENOBUFS;
        sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot);
@@ -937,6 +934,11 @@ static int __init inet6_init(void)
        if (err)
                goto out_unregister_sock;
+#ifdef CONFIG_SYSCTL
+        err = ipv6_static_sysctl_register();
+        if (err)
+                goto static_sysctl_fail;
+#endif
        /*
         *      ipngwg API draft makes clear that the correct semantics
         *      for TCP and UDP is to consider one TCP and UDP instance
@@ -1061,6 +1063,10 @@ ipmr_fail:
 icmp_fail:
        unregister_pernet_subsys(&inet6_net_ops);
 register_pernet_fail:
+#ifdef CONFIG_SYSCTL
+        ipv6_static_sysctl_unregister();
+static_sysctl_fail:
+#endif
        cleanup_ipv6_mibs();
 out_unregister_sock:
        sock_unregister(PF_INET6);
@@ -1116,6 +1122,9 @@ static void __exit inet6_exit(void)
        rawv6_exit();
        unregister_pernet_subsys(&inet6_net_ops);
+#ifdef CONFIG_SYSCTL
+        ipv6_static_sysctl_unregister();
+#endif
        cleanup_ipv6_mibs();
        proto_unregister(&rawv6_prot);
        proto_unregister(&udplitev6_prot);
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index 87801cc1b2f8..16d43f20b32f 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -98,7 +98,7 @@ struct request_sock *inet6_csk_search_req(const struct sock *sk,
                    ipv6_addr_equal(&treq->rmt_addr, raddr) &&
                    ipv6_addr_equal(&treq->loc_addr, laddr) &&
                    (!treq->iif || treq->iif == iif)) {
-                        BUG_TRAP(req->sk == NULL);
+                        WARN_ON(req->sk != NULL);
                        *prevp = prev;
                        return req;
                }
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 00a8a5f9380c..1646a5658255 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -28,7 +28,7 @@ void __inet6_hash(struct sock *sk)
        struct hlist_head *list;
        rwlock_t *lock;
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
        if (sk->sk_state == TCP_LISTEN) {
                list = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
@@ -202,7 +202,7 @@ unique:
         * in hash table socket with a funny identity. */
        inet->num = lport;
        inet->sport = htons(lport);
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
        __sk_add_node(sk, &head->chain);
        sk->sk_hash = hash;
        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 4de2b9efcacb..52dddc25d3e6 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -287,7 +287,7 @@ static int fib6_dump_node(struct fib6_walker_t *w)
                        w->leaf = rt;
                        return 1;
                }
-                BUG_TRAP(res!=0);
+                WARN_ON(res == 0);
        }
        w->leaf = NULL;
        return 0;
@@ -661,17 +661,17 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
 static __inline__ void fib6_start_gc(struct net *net, struct rt6_info *rt)
 {
-        if (net->ipv6.ip6_fib_timer->expires == 0 &&
+        if (!timer_pending(&net->ipv6.ip6_fib_timer) &&
            (rt->rt6i_flags & (RTF_EXPIRES|RTF_CACHE)))
-                mod_timer(net->ipv6.ip6_fib_timer, jiffies +
+                mod_timer(&net->ipv6.ip6_fib_timer,
-                          net->ipv6.sysctl.ip6_rt_gc_interval);
+                          jiffies + net->ipv6.sysctl.ip6_rt_gc_interval);
 }
 void fib6_force_start_gc(struct net *net)
 {
-        if (net->ipv6.ip6_fib_timer->expires == 0)
+        if (!timer_pending(&net->ipv6.ip6_fib_timer))
-                mod_timer(net->ipv6.ip6_fib_timer, jiffies +
+                mod_timer(&net->ipv6.ip6_fib_timer,
-                          net->ipv6.sysctl.ip6_rt_gc_interval);
+                          jiffies + net->ipv6.sysctl.ip6_rt_gc_interval);
 }
 /*
@@ -778,7 +778,7 @@ out:
                        pn->leaf = fib6_find_prefix(info->nl_net, pn);
 #if RT6_DEBUG >= 2
                        if (!pn->leaf) {
-                                BUG_TRAP(pn->leaf != NULL);
+                                WARN_ON(pn->leaf == NULL);
                                pn->leaf = info->nl_net->ipv6.ip6_null_entry;
                        }
 #endif
@@ -942,7 +942,7 @@ struct fib6_node * fib6_locate(struct fib6_node *root,
 #ifdef CONFIG_IPV6_SUBTREES
        if (src_len) {
-                BUG_TRAP(saddr!=NULL);
+                WARN_ON(saddr == NULL);
                if (fn && fn->subtree)
                        fn = fib6_locate_1(fn->subtree, saddr, src_len,
                                           offsetof(struct rt6_info, rt6i_src));
@@ -996,9 +996,9 @@ static struct fib6_node *fib6_repair_tree(struct net *net,
                RT6_TRACE("fixing tree: plen=%d iter=%d\n", fn->fn_bit, iter);
                iter++;
-                BUG_TRAP(!(fn->fn_flags&RTN_RTINFO));
+                WARN_ON(fn->fn_flags & RTN_RTINFO);
-                BUG_TRAP(!(fn->fn_flags&RTN_TL_ROOT));
+                WARN_ON(fn->fn_flags & RTN_TL_ROOT);
-                BUG_TRAP(fn->leaf==NULL);
+                WARN_ON(fn->leaf != NULL);
                children = 0;
                child = NULL;
@@ -1014,7 +1014,7 @@ static struct fib6_node *fib6_repair_tree(struct net *net,
                        fn->leaf = fib6_find_prefix(net, fn);
 #if RT6_DEBUG >= 2
                        if (fn->leaf==NULL) {
-                                BUG_TRAP(fn->leaf);
+                                WARN_ON(!fn->leaf);
                                fn->leaf = net->ipv6.ip6_null_entry;
                        }
 #endif
@@ -1025,16 +1025,17 @@ static struct fib6_node *fib6_repair_tree(struct net *net,
                pn = fn->parent;
 #ifdef CONFIG_IPV6_SUBTREES
                if (FIB6_SUBTREE(pn) == fn) {
-                        BUG_TRAP(fn->fn_flags&RTN_ROOT);
+                        WARN_ON(!(fn->fn_flags & RTN_ROOT));
                        FIB6_SUBTREE(pn) = NULL;
                        nstate = FWS_L;
                } else {
-                        BUG_TRAP(!(fn->fn_flags&RTN_ROOT));
+                        WARN_ON(fn->fn_flags & RTN_ROOT);
 #endif
                        if (pn->right == fn) pn->right = child;
                        else if (pn->left == fn) pn->left = child;
 #if RT6_DEBUG >= 2
-                        else BUG_TRAP(0);
+                        else
+                                WARN_ON(1);
 #endif
                        if (child)
                                child->parent = pn;
@@ -1154,14 +1155,14 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info)
 #if RT6_DEBUG >= 2
        if (rt->u.dst.obsolete>0) {
-                BUG_TRAP(fn==NULL);
+                WARN_ON(fn != NULL);
                return -ENOENT;
        }
 #endif
        if (fn == NULL || rt == net->ipv6.ip6_null_entry)
                return -ENOENT;
-        BUG_TRAP(fn->fn_flags&RTN_RTINFO);
+        WARN_ON(!(fn->fn_flags & RTN_RTINFO));
        if (!(rt->rt6i_flags&RTF_CACHE)) {
                struct fib6_node *pn = fn;
@@ -1266,7 +1267,7 @@ static int fib6_walk_continue(struct fib6_walker_t *w)
                        w->node = pn;
 #ifdef CONFIG_IPV6_SUBTREES
                        if (FIB6_SUBTREE(pn) == fn) {
-                                BUG_TRAP(fn->fn_flags&RTN_ROOT);
+                                WARN_ON(!(fn->fn_flags & RTN_ROOT));
                                w->state = FWS_L;
                                continue;
                        }
@@ -1281,7 +1282,7 @@ static int fib6_walk_continue(struct fib6_walker_t *w)
                                continue;
                        }
 #if RT6_DEBUG >= 2
-                        BUG_TRAP(0);
+                        WARN_ON(1);
 #endif
                }
        }
@@ -1323,7 +1324,7 @@ static int fib6_clean_node(struct fib6_walker_t *w)
                        }
                        return 0;
                }
-                BUG_TRAP(res==0);
+                WARN_ON(res != 0);
        }
        w->leaf = rt;
        return 0;
@@ -1447,27 +1448,23 @@ void fib6_run_gc(unsigned long expires, struct net *net)
                gc_args.timeout = expires ? (int)expires :
                        net->ipv6.sysctl.ip6_rt_gc_interval;
        } else {
-                local_bh_disable();
+                if (!spin_trylock_bh(&fib6_gc_lock)) {
-                if (!spin_trylock(&fib6_gc_lock)) {
+                        mod_timer(&net->ipv6.ip6_fib_timer, jiffies + HZ);
-                        mod_timer(net->ipv6.ip6_fib_timer, jiffies + HZ);
-                        local_bh_enable();
                        return;
                }
                gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval;
        }
-        gc_args.more = 0;
-        icmp6_dst_gc(&gc_args.more);
+        gc_args.more = icmp6_dst_gc();
        fib6_clean_all(net, fib6_age, 0, NULL);
        if (gc_args.more)
-                mod_timer(net->ipv6.ip6_fib_timer, jiffies +
+                mod_timer(&net->ipv6.ip6_fib_timer,
-                          net->ipv6.sysctl.ip6_rt_gc_interval);
+                          round_jiffies(jiffies
-        else {
+                                        + net->ipv6.sysctl.ip6_rt_gc_interval));
-                del_timer(net->ipv6.ip6_fib_timer);
+        else
-                net->ipv6.ip6_fib_timer->expires = 0;
+                del_timer(&net->ipv6.ip6_fib_timer);
-        }
        spin_unlock_bh(&fib6_gc_lock);
 }
@@ -1478,24 +1475,15 @@ static void fib6_gc_timer_cb(unsigned long arg)
 static int fib6_net_init(struct net *net)
 {
-        int ret;
+        setup_timer(&net->ipv6.ip6_fib_timer, fib6_gc_timer_cb, (unsigned long)net);
-        struct timer_list *timer;
-        ret = -ENOMEM;
-        timer = kzalloc(sizeof(*timer), GFP_KERNEL);
-        if (!timer)
-                goto out;
-        setup_timer(timer, fib6_gc_timer_cb, (unsigned long)net);
-        net->ipv6.ip6_fib_timer = timer;
        net->ipv6.rt6_stats = kzalloc(sizeof(*net->ipv6.rt6_stats), GFP_KERNEL);
        if (!net->ipv6.rt6_stats)
                goto out_timer;
-        net->ipv6.fib_table_hash =
+        net->ipv6.fib_table_hash = kcalloc(FIB_TABLE_HASHSZ,
-                kzalloc(sizeof(*net->ipv6.fib_table_hash)*FIB_TABLE_HASHSZ,
+                                           sizeof(*net->ipv6.fib_table_hash),
-                        GFP_KERNEL);
+                                           GFP_KERNEL);
        if (!net->ipv6.fib_table_hash)
                goto out_rt6_stats;
@@ -1521,9 +1509,7 @@ static int fib6_net_init(struct net *net)
 #endif
        fib6_tables_init(net);
-        ret = 0;
+        return 0;
-out:
-        return ret;
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
 out_fib6_main_tbl:
@@ -1534,15 +1520,14 @@ out_fib_table_hash:
 out_rt6_stats:
        kfree(net->ipv6.rt6_stats);
 out_timer:
-        kfree(timer);
+        return -ENOMEM;
-        goto out;
 }
 static void fib6_net_exit(struct net *net)
 {
        rt6_ifdown(net, NULL);
-        del_timer_sync(net->ipv6.ip6_fib_timer);
+        del_timer_sync(&net->ipv6.ip6_fib_timer);
-        kfree(net->ipv6.ip6_fib_timer);
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
        kfree(net->ipv6.fib6_local_tbl);
 #endif
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 6407c64ea4a5..6811901e6b1e 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -116,7 +116,7 @@ static int ip6_dev_loopback_xmit(struct sk_buff *newskb)
        __skb_pull(newskb, skb_network_offset(newskb));
        newskb->pkt_type = PACKET_LOOPBACK;
        newskb->ip_summed = CHECKSUM_UNNECESSARY;
-        BUG_TRAP(newskb->dst);
+        WARN_ON(!newskb->dst);
        netif_rx(newskb);
        return 0;
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index ee6de425ce6b..0cfcea42153a 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -50,125 +50,6 @@
 #include <linux/icmpv6.h>
 #include <linux/mutex.h>
-struct ipcomp6_tfms {
-        struct list_head list;
-        struct crypto_comp **tfms;
-        int users;
-};
-static DEFINE_MUTEX(ipcomp6_resource_mutex);
-static void **ipcomp6_scratches;
-static int ipcomp6_scratch_users;
-static LIST_HEAD(ipcomp6_tfms_list);
-static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int nexthdr;
-        int err = -ENOMEM;
-        struct ip_comp_hdr *ipch;
-        int plen, dlen;
-        struct ipcomp_data *ipcd = x->data;
-        u8 *start, *scratch;
-        struct crypto_comp *tfm;
-        int cpu;
-        if (skb_linearize_cow(skb))
-                goto out;
-        skb->ip_summed = CHECKSUM_NONE;
-        /* Remove ipcomp header and decompress original payload */
-        ipch = (void *)skb->data;
-        nexthdr = ipch->nexthdr;
-        skb->transport_header = skb->network_header + sizeof(*ipch);
-        __skb_pull(skb, sizeof(*ipch));
-        /* decompression */
-        plen = skb->len;
-        dlen = IPCOMP_SCRATCH_SIZE;
-        start = skb->data;
-        cpu = get_cpu();
-        scratch = *per_cpu_ptr(ipcomp6_scratches, cpu);
-        tfm = *per_cpu_ptr(ipcd->tfms, cpu);
-        err = crypto_comp_decompress(tfm, start, plen, scratch, &dlen);
-        if (err)
-                goto out_put_cpu;
-        if (dlen < (plen + sizeof(*ipch))) {
-                err = -EINVAL;
-                goto out_put_cpu;
-        }
-        err = pskb_expand_head(skb, 0, dlen - plen, GFP_ATOMIC);
-        if (err) {
-                goto out_put_cpu;
-        }
-        skb->truesize += dlen - plen;
-        __skb_put(skb, dlen - plen);
-        skb_copy_to_linear_data(skb, scratch, dlen);
-        err = nexthdr;
-out_put_cpu:
-        put_cpu();
-out:
-        return err;
-}
-static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int err;
-        struct ip_comp_hdr *ipch;
-        struct ipcomp_data *ipcd = x->data;
-        int plen, dlen;
-        u8 *start, *scratch;
-        struct crypto_comp *tfm;
-        int cpu;
-        /* check whether datagram len is larger than threshold */
-        if (skb->len < ipcd->threshold) {
-                goto out_ok;
-        }
-        if (skb_linearize_cow(skb))
-                goto out_ok;
-        /* compression */
-        plen = skb->len;
-        dlen = IPCOMP_SCRATCH_SIZE;
-        start = skb->data;
-        cpu = get_cpu();
-        scratch = *per_cpu_ptr(ipcomp6_scratches, cpu);
-        tfm = *per_cpu_ptr(ipcd->tfms, cpu);
-        local_bh_disable();
-        err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
-        local_bh_enable();
-        if (err || (dlen + sizeof(*ipch)) >= plen) {
-                put_cpu();
-                goto out_ok;
-        }
-        memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen);
-        put_cpu();
-        pskb_trim(skb, dlen + sizeof(struct ip_comp_hdr));
-        /* insert ipcomp header and replace datagram */
-        ipch = ip_comp_hdr(skb);
-        ipch->nexthdr = *skb_mac_header(skb);
-        ipch->flags = 0;
-        ipch->cpi = htons((u16 )ntohl(x->id.spi));
-        *skb_mac_header(skb) = IPPROTO_COMP;
-out_ok:
-        skb_push(skb, -skb_network_offset(skb));
-        return 0;
-}
 static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                                int type, int code, int offset, __be32 info)
 {
@@ -251,161 +132,12 @@ out:
        return err;
 }
-static void ipcomp6_free_scratches(void)
-{
-        int i;
-        void **scratches;
-        if (--ipcomp6_scratch_users)
-                return;
-        scratches = ipcomp6_scratches;
-        if (!scratches)
-                return;
-        for_each_possible_cpu(i) {
-                void *scratch = *per_cpu_ptr(scratches, i);
-                vfree(scratch);
-        }
-        free_percpu(scratches);
-}
-static void **ipcomp6_alloc_scratches(void)
-{
-        int i;
-        void **scratches;
-        if (ipcomp6_scratch_users++)
-                return ipcomp6_scratches;
-        scratches = alloc_percpu(void *);
-        if (!scratches)
-                return NULL;
-        ipcomp6_scratches = scratches;
-        for_each_possible_cpu(i) {
-                void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
-                if (!scratch)
-                        return NULL;
-                *per_cpu_ptr(scratches, i) = scratch;
-        }
-        return scratches;
-}
-static void ipcomp6_free_tfms(struct crypto_comp **tfms)
-{
-        struct ipcomp6_tfms *pos;
-        int cpu;
-        list_for_each_entry(pos, &ipcomp6_tfms_list, list) {
-                if (pos->tfms == tfms)
-                        break;
-        }
-        BUG_TRAP(pos);
-        if (--pos->users)
-                return;
-        list_del(&pos->list);
-        kfree(pos);
-        if (!tfms)
-                return;
-        for_each_possible_cpu(cpu) {
-                struct crypto_comp *tfm = *per_cpu_ptr(tfms, cpu);
-                crypto_free_comp(tfm);
-        }
-        free_percpu(tfms);
-}
-static struct crypto_comp **ipcomp6_alloc_tfms(const char *alg_name)
-{
-        struct ipcomp6_tfms *pos;
-        struct crypto_comp **tfms;
-        int cpu;
-        /* This can be any valid CPU ID so we don't need locking. */
-        cpu = raw_smp_processor_id();
-        list_for_each_entry(pos, &ipcomp6_tfms_list, list) {
-                struct crypto_comp *tfm;
-                tfms = pos->tfms;
-                tfm = *per_cpu_ptr(tfms, cpu);
-                if (!strcmp(crypto_comp_name(tfm), alg_name)) {
-                        pos->users++;
-                        return tfms;
-                }
-        }
-        pos = kmalloc(sizeof(*pos), GFP_KERNEL);
-        if (!pos)
-                return NULL;
-        pos->users = 1;
-        INIT_LIST_HEAD(&pos->list);
-        list_add(&pos->list, &ipcomp6_tfms_list);
-        pos->tfms = tfms = alloc_percpu(struct crypto_comp *);
-        if (!tfms)
-                goto error;
-        for_each_possible_cpu(cpu) {
-                struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,
-                                                            CRYPTO_ALG_ASYNC);
-                if (IS_ERR(tfm))
-                        goto error;
-                *per_cpu_ptr(tfms, cpu) = tfm;
-        }
-        return tfms;
-error:
-        ipcomp6_free_tfms(tfms);
-        return NULL;
-}
-static void ipcomp6_free_data(struct ipcomp_data *ipcd)
-{
-        if (ipcd->tfms)
-                ipcomp6_free_tfms(ipcd->tfms);
-        ipcomp6_free_scratches();
-}
-static void ipcomp6_destroy(struct xfrm_state *x)
-{
-        struct ipcomp_data *ipcd = x->data;
-        if (!ipcd)
-                return;
-        xfrm_state_delete_tunnel(x);
-        mutex_lock(&ipcomp6_resource_mutex);
-        ipcomp6_free_data(ipcd);
-        mutex_unlock(&ipcomp6_resource_mutex);
-        kfree(ipcd);
-        xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr);
-}
 static int ipcomp6_init_state(struct xfrm_state *x)
 {
        int err;
        struct ipcomp_data *ipcd;
        struct xfrm_algo_desc *calg_desc;
-        err = -EINVAL;
-        if (!x->calg)
-                goto out;
-        if (x->encap)
-                goto out;
        x->props.header_len = 0;
        switch (x->props.mode) {
        case XFRM_MODE_TRANSPORT:
@@ -417,39 +149,21 @@ static int ipcomp6_init_state(struct xfrm_state *x)
                goto out;
        }
-        err = -ENOMEM;
+        err = ipcomp_init_state(x);
-        ipcd = kzalloc(sizeof(*ipcd), GFP_KERNEL);
+        if (err)
-        if (!ipcd)
                goto out;
-        mutex_lock(&ipcomp6_resource_mutex);
-        if (!ipcomp6_alloc_scratches())
-                goto error;
-        ipcd->tfms = ipcomp6_alloc_tfms(x->calg->alg_name);
-        if (!ipcd->tfms)
-                goto error;
-        mutex_unlock(&ipcomp6_resource_mutex);
        if (x->props.mode == XFRM_MODE_TUNNEL) {
                err = ipcomp6_tunnel_attach(x);
                if (err)
                        goto error_tunnel;
        }
-        calg_desc = xfrm_calg_get_byname(x->calg->alg_name, 0);
-        BUG_ON(!calg_desc);
-        ipcd->threshold = calg_desc->uinfo.comp.threshold;
-        x->data = ipcd;
        err = 0;
 out:
        return err;
 error_tunnel:
-        mutex_lock(&ipcomp6_resource_mutex);
+        ipcomp_destroy(x);
-error:
-        ipcomp6_free_data(ipcd);
-        mutex_unlock(&ipcomp6_resource_mutex);
-        kfree(ipcd);
        goto out;
 }
@@ -460,9 +174,9 @@ static const struct xfrm_type ipcomp6_type =
        .owner          = THIS_MODULE,
        .proto          = IPPROTO_COMP,
        .init_state     = ipcomp6_init_state,
-        .destructor     = ipcomp6_destroy,
+        .destructor     = ipcomp_destroy,
-        .input          = ipcomp6_input,
+        .input          = ipcomp_input,
-        .output         = ipcomp6_output,
+        .output         = ipcomp_output,
        .hdr_offset     = xfrm6_find_1stfragopt,
 };
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index ad1cc5bbf977..31295c8f6196 100644
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -164,8 +164,8 @@ static int mip6_destopt_output(struct xfrm_state *x, struct sk_buff *skb)
                        calc_padlen(sizeof(*dstopt), 6));
        hao->type = IPV6_TLV_HAO;
+        BUILD_BUG_ON(sizeof(*hao) != 18);
        hao->length = sizeof(*hao) - 2;
-        BUG_TRAP(hao->length == 16);
        len = ((char *)hao - (char *)dstopt) + sizeof(*hao);
@@ -174,7 +174,7 @@ static int mip6_destopt_output(struct xfrm_state *x, struct sk_buff *skb)
        memcpy(&iph->saddr, x->coaddr, sizeof(iph->saddr));
        spin_unlock_bh(&x->lock);
-        BUG_TRAP(len == x->props.header_len);
+        WARN_ON(len != x->props.header_len);
        dstopt->hdrlen = (x->props.header_len >> 3) - 1;
        return 0;
@@ -317,7 +317,7 @@ static int mip6_destopt_init_state(struct xfrm_state *x)
        x->props.header_len = sizeof(struct ipv6_destopt_hdr) +
                calc_padlen(sizeof(struct ipv6_destopt_hdr), 6) +
                sizeof(struct ipv6_destopt_hao);
-        BUG_TRAP(x->props.header_len == 24);
+        WARN_ON(x->props.header_len != 24);
        return 0;
 }
@@ -380,7 +380,7 @@ static int mip6_rthdr_output(struct xfrm_state *x, struct sk_buff *skb)
        rt2->rt_hdr.segments_left = 1;
        memset(&rt2->reserved, 0, sizeof(rt2->reserved));
-        BUG_TRAP(rt2->rt_hdr.hdrlen == 2);
+        WARN_ON(rt2->rt_hdr.hdrlen != 2);
        memcpy(&rt2->addr, &iph->daddr, sizeof(rt2->addr));
        spin_lock_bh(&x->lock);
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 689dec899c57..0cfcce7b18d8 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -213,7 +213,7 @@ config IP6_NF_SECURITY
       tristate "Security table"
       depends on IP6_NF_IPTABLES
       depends on SECURITY
-       default m if NETFILTER_ADVANCED=n
+       depends on NETFILTER_ADVANCED
       help
         This option adds a `security' table to iptables, for use
         with Mandatory Access Control (MAC) policy.
diff --git a/net/ipv6/netfilter/ip6table_security.c b/net/ipv6/netfilter/ip6table_security.c
index a07abee30497..6e7131036bc6 100644
--- a/net/ipv6/netfilter/ip6table_security.c
+++ b/net/ipv6/netfilter/ip6table_security.c
@@ -31,7 +31,7 @@ static struct
        struct ip6t_replace repl;
        struct ip6t_standard entries[3];
        struct ip6t_error term;
-} initial_table __initdata = {
+} initial_table __net_initdata = {
        .repl = {
                .name = "security",
                .valid_hooks = SECURITY_VALID_HOOKS,
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index cf20bc4fd60d..52d06dd4b817 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -416,8 +416,8 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
        fq_kill(fq);
-        BUG_TRAP(head != NULL);
+        WARN_ON(head == NULL);
-        BUG_TRAP(NFCT_FRAG6_CB(head)->offset == 0);
+        WARN_ON(NFCT_FRAG6_CB(head)->offset != 0);
        /* Unfragmented part is taken from the first segment. */
        payload_len = ((head->data - skb_network_header(head)) -
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 6ab957ec2dd6..89184b576e23 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -473,8 +473,8 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
                fq->q.fragments = head;
        }
-        BUG_TRAP(head != NULL);
+        WARN_ON(head == NULL);
-        BUG_TRAP(FRAG6_CB(head)->offset == 0);
+        WARN_ON(FRAG6_CB(head)->offset != 0);
        /* Unfragmented part is taken from the first segment. */
        payload_len = ((head->data - skb_network_header(head)) -
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 615b328de251..86540b24b27c 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -978,13 +978,12 @@ out:
        return &rt->u.dst;
 }
-int icmp6_dst_gc(int *more)
+int icmp6_dst_gc(void)
 {
        struct dst_entry *dst, *next, **pprev;
-        int freed;
+        int more = 0;
        next = NULL;
-        freed = 0;
        spin_lock_bh(&icmp6_dst_lock);
        pprev = &icmp6_dst_gc_list;
@@ -993,16 +992,15 @@ int icmp6_dst_gc(int *more)
                if (!atomic_read(&dst->__refcnt)) {
                        *pprev = dst->next;
                        dst_free(dst);
-                        freed++;
                } else {
                        pprev = &dst->next;
-                        (*more)++;
+                        ++more;
                }
        }
        spin_unlock_bh(&icmp6_dst_lock);
-        return freed;
+        return more;
 }
 static int ip6_dst_gc(struct dst_ops *ops)
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 6a68eeb7bbf8..a46badd1082d 100644
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -223,6 +223,7 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb)
        req->expires = 0UL;
        req->retrans = 0;
+        ireq->ecn_ok            = 0;
        ireq->snd_wscale        = tcp_opt.snd_wscale;
        ireq->rcv_wscale        = tcp_opt.rcv_wscale;
        ireq->sack_ok           = tcp_opt.sack_ok;
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 5c99274558bf..e6dfaeac6be3 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -150,3 +150,19 @@ void ipv6_sysctl_unregister(void)
        unregister_net_sysctl_table(ip6_header);
        unregister_pernet_subsys(&ipv6_sysctl_net_ops);
 }
+static struct ctl_table_header *ip6_base;
+int ipv6_static_sysctl_register(void)
+{
+        static struct ctl_table empty[1];
+        ip6_base = register_net_sysctl_rotable(net_ipv6_ctl_path, empty);
+        if (ip6_base == NULL)
+                return -ENOMEM;
+        return 0;
+}
+void ipv6_static_sysctl_unregister(void)
+{
+        unregister_net_sysctl_table(ip6_base);
+}
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index ae45f9835014..cff778b23a7f 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -421,7 +421,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                /* ICMPs are not backlogged, hence we cannot get
                 * an established socket here.
                 */
-                BUG_TRAP(req->sk == NULL);
+                WARN_ON(req->sk != NULL);
                if (seq != tcp_rsk(req)->snt_isn) {
                        NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 265b1b289a32..705959b31e24 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -497,7 +497,7 @@ static void iucv_setmask_up(void)
        /* Disable all cpu but the first in cpu_irq_cpumask. */
        cpumask = iucv_irq_cpumask;
        cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);
-        for_each_cpu_mask(cpu, cpumask)
+        for_each_cpu_mask_nr(cpu, cpumask)
                smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);
 }
diff --git a/net/key/af_key.c b/net/key/af_key.c
index f0fc46c8038d..d628df97e02e 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -96,8 +96,8 @@ static void pfkey_sock_destruct(struct sock *sk)
                return;
        }
-        BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_rmem_alloc));
-        BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_wmem_alloc));
        atomic_dec(&pfkey_socks_nr);
 }
diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c
index 3469bc71a385..4b2c769d555f 100644
--- a/net/netfilter/nf_conntrack_extend.c
+++ b/net/netfilter/nf_conntrack_extend.c
@@ -95,7 +95,7 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
        newlen = newoff + t->len;
        rcu_read_unlock();
-        new = krealloc(ct->ext, newlen, gfp);
+        new = __krealloc(ct->ext, newlen, gfp);
        if (!new)
                return NULL;
@@ -115,10 +115,10 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
                ct->ext = new;
        }
-        ct->ext->offset[id] = newoff;
+        new->offset[id] = newoff;
-        ct->ext->len = newlen;
+        new->len = newlen;
-        memset((void *)ct->ext + newoff, 0, newlen - newoff);
+        memset((void *)new + newoff, 0, newlen - newoff);
-        return (void *)ct->ext + newoff;
+        return (void *)new + newoff;
 }
 EXPORT_SYMBOL(__nf_ct_ext_add);
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 98bfe277eab2..b0eacc0007cc 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -158,9 +158,10 @@ static void netlink_sock_destruct(struct sock *sk)
                printk(KERN_ERR "Freeing alive netlink socket %p\n", sk);
                return;
        }
-        BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc));
-        BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_rmem_alloc));
-        BUG_TRAP(!nlk_sk(sk)->groups);
+        WARN_ON(atomic_read(&sk->sk_wmem_alloc));
+        WARN_ON(nlk_sk(sk)->groups);
 }
 /* This lock without WQ_FLAG_EXCLUSIVE is good on UP and it is _very_ bad on
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index fccc250f95f5..532e4faa29f7 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -73,6 +73,7 @@ static const struct proto_ops nr_proto_ops;
 * separate class since they always nest.
 */
 static struct lock_class_key nr_netdev_xmit_lock_key;
+static struct lock_class_key nr_netdev_addr_lock_key;
 static void nr_set_lockdep_one(struct net_device *dev,
                               struct netdev_queue *txq,
@@ -83,6 +84,7 @@ static void nr_set_lockdep_one(struct net_device *dev,
 static void nr_set_lockdep_key(struct net_device *dev)
 {
+        lockdep_set_class(&dev->addr_list_lock, &nr_netdev_addr_lock_key);
        netdev_for_each_tx_queue(dev, nr_set_lockdep_one, NULL);
 }
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index d56cae112dc8..c718e7e3f7de 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -260,8 +260,8 @@ static inline struct packet_sock *pkt_sk(struct sock *sk)
 static void packet_sock_destruct(struct sock *sk)
 {
-        BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_rmem_alloc));
-        BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_wmem_alloc));
        if (!sock_flag(sk, SOCK_DEAD)) {
                printk("Attempt to release alive packet socket: %p\n", sk);
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index dbc963b4f5fb..a7f1ce11bc22 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -74,6 +74,7 @@ ax25_address rose_callsign;
 * separate class since they always nest.
 */
 static struct lock_class_key rose_netdev_xmit_lock_key;
+static struct lock_class_key rose_netdev_addr_lock_key;
 static void rose_set_lockdep_one(struct net_device *dev,
                                 struct netdev_queue *txq,
@@ -84,6 +85,7 @@ static void rose_set_lockdep_one(struct net_device *dev,
 static void rose_set_lockdep_key(struct net_device *dev)
 {
+        lockdep_set_class(&dev->addr_list_lock, &rose_netdev_addr_lock_key);
        netdev_for_each_tx_queue(dev, rose_set_lockdep_one, NULL);
 }
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 4b2682feeedc..32e489118beb 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -660,9 +660,9 @@ static void rxrpc_sock_destructor(struct sock *sk)
        rxrpc_purge_queue(&sk->sk_receive_queue);
-        BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_wmem_alloc));
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
-        BUG_TRAP(!sk->sk_socket);
+        WARN_ON(sk->sk_socket);
        if (!sock_flag(sk, SOCK_DEAD)) {
                printk("Attempt to release alive rxrpc socket: %p\n", sk);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 74e662cbb2c5..d308c19aa3f9 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -41,7 +41,7 @@ void tcf_hash_destroy(struct tcf_common *p, struct tcf_hashinfo *hinfo)
                        return;
                }
        }
-        BUG_TRAP(0);
+        WARN_ON(1);
 }
 EXPORT_SYMBOL(tcf_hash_destroy);
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 32c3f9d9fb7a..38015b493947 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -116,7 +116,7 @@ static void tcf_police_destroy(struct tcf_police *p)
                        return;
                }
        }
-        BUG_TRAP(0);
+        WARN_ON(1);
 }
 static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = {
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 527db2559dd2..246f9065ce34 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -345,7 +345,7 @@ static int u32_delete_key(struct tcf_proto *tp, struct tc_u_knode* key)
                        }
                }
        }
-        BUG_TRAP(0);
+        WARN_ON(1);
        return 0;
 }
@@ -368,7 +368,7 @@ static int u32_destroy_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht)
        struct tc_u_common *tp_c = tp->data;
        struct tc_u_hnode **hn;
-        BUG_TRAP(!ht->refcnt);
+        WARN_ON(ht->refcnt);
        u32_clear_hnode(tp, ht);
@@ -380,7 +380,7 @@ static int u32_destroy_hnode(struct tcf_proto *tp, struct tc_u_hnode *ht)
                }
        }
-        BUG_TRAP(0);
+        WARN_ON(1);
        return -ENOENT;
 }
@@ -389,7 +389,7 @@ static void u32_destroy(struct tcf_proto *tp)
        struct tc_u_common *tp_c = tp->data;
        struct tc_u_hnode *root_ht = xchg(&tp->root, NULL);
-        BUG_TRAP(root_ht != NULL);
+        WARN_ON(root_ht == NULL);
        if (root_ht && --root_ht->refcnt == 0)
                u32_destroy_hnode(tp, root_ht);
@@ -407,7 +407,7 @@ static void u32_destroy(struct tcf_proto *tp)
                while ((ht = tp_c->hlist) != NULL) {
                        tp_c->hlist = ht->next;
-                        BUG_TRAP(ht->refcnt == 0);
+                        WARN_ON(ht->refcnt != 0);
                        kfree(ht);
                }
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 5219d5f9d754..b0601642e227 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -447,7 +447,7 @@ void qdisc_watchdog_cancel(struct qdisc_watchdog *wd)
 }
 EXPORT_SYMBOL(qdisc_watchdog_cancel);
-struct hlist_head *qdisc_class_hash_alloc(unsigned int n)
+static struct hlist_head *qdisc_class_hash_alloc(unsigned int n)
 {
        unsigned int size = n * sizeof(struct hlist_head), i;
        struct hlist_head *h;
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 04faa835be17..6b517b9dac5b 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -162,7 +162,7 @@ static void atm_tc_put(struct Qdisc *sch, unsigned long cl)
        qdisc_destroy(flow->q);
        tcf_destroy_chain(&flow->filter_list);
        if (flow->sock) {
-                pr_debug("atm_tc_put: f_count %d\n",
+                pr_debug("atm_tc_put: f_count %ld\n",
                        file_count(flow->sock->file));
                flow->vcc->pop = flow->old_pop;
                sockfd_put(flow->sock);
@@ -259,7 +259,7 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
        sock = sockfd_lookup(fd, &error);
        if (!sock)
                return error;   /* f_count++ */
-        pr_debug("atm_tc_change: f_count %d\n", file_count(sock->file));
+        pr_debug("atm_tc_change: f_count %ld\n", file_count(sock->file));
        if (sock->ops->family != PF_ATMSVC && sock->ops->family != PF_ATMPVC) {
                error = -EPROTOTYPE;
                goto err_out;
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index f1d2f8ec8b4c..14954bf4a683 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1175,7 +1175,7 @@ static void cbq_unlink_class(struct cbq_class *this)
                                this->tparent->children = NULL;
                }
        } else {
-                BUG_TRAP(this->sibling == this);
+                WARN_ON(this->sibling != this);
        }
 }
@@ -1699,7 +1699,7 @@ static void cbq_destroy_class(struct Qdisc *sch, struct cbq_class *cl)
 {
        struct cbq_sched_data *q = qdisc_priv(sch);
-        BUG_TRAP(!cl->filters);
+        WARN_ON(cl->filters);
        tcf_destroy_chain(&cl->filter_list);
        qdisc_destroy(cl->q);
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index cb625b4d6da5..fd2a6cadb115 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -212,9 +212,9 @@ static void dev_watchdog(unsigned long arg)
                        if (some_queue_stopped &&
                            time_after(jiffies, (dev->trans_start +
                                                 dev->watchdog_timeo))) {
-                                printk(KERN_INFO "NETDEV WATCHDOG: %s: "
+                                char drivername[64];
-                                       "transmit timed out\n",
+                                printk(KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit timed out\n",
-                                       dev->name);
+                                       dev->name, netdev_drivername(dev, drivername, 64));
                                dev->tx_timeout(dev);
                                WARN_ON_ONCE(1);
                        }
@@ -736,9 +736,9 @@ static void shutdown_scheduler_queue(struct net_device *dev,
                dev_queue->qdisc = qdisc_default;
                dev_queue->qdisc_sleeping = qdisc_default;
-                spin_lock(root_lock);
+                spin_lock_bh(root_lock);
                qdisc_destroy(qdisc);
-                spin_unlock(root_lock);
+                spin_unlock_bh(root_lock);
        }
 }
@@ -746,5 +746,5 @@ void dev_shutdown(struct net_device *dev)
 {
        netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc);
        shutdown_scheduler_queue(dev, &dev->rx_queue, NULL);
-        BUG_TRAP(!timer_pending(&dev->watchdog_timer));
+        WARN_ON(timer_pending(&dev->watchdog_timer));
 }
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 30c999c61b01..75a40951c4f2 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -524,7 +524,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, long *diff)
 */
 static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
 {
-        BUG_TRAP(!cl->level && cl->un.leaf.q && cl->un.leaf.q->q.qlen);
+        WARN_ON(cl->level || !cl->un.leaf.q || !cl->un.leaf.q->q.qlen);
        if (!cl->prio_activity) {
                cl->prio_activity = 1 << (cl->un.leaf.aprio = cl->un.leaf.prio);
@@ -542,7 +542,7 @@ static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
 */
 static inline void htb_deactivate(struct htb_sched *q, struct htb_class *cl)
 {
-        BUG_TRAP(cl->prio_activity);
+        WARN_ON(!cl->prio_activity);
        htb_deactivate_prios(q, cl);
        cl->prio_activity = 0;
@@ -757,7 +757,7 @@ static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
                u32 *pid;
        } stk[TC_HTB_MAXDEPTH], *sp = stk;
-        BUG_TRAP(tree->rb_node);
+        WARN_ON(!tree->rb_node);
        sp->root = tree->rb_node;
        sp->pptr = pptr;
        sp->pid = pid;
@@ -777,7 +777,7 @@ static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
                                *sp->pptr = (*sp->pptr)->rb_left;
                        if (sp > stk) {
                                sp--;
-                                BUG_TRAP(*sp->pptr);
+                                WARN_ON(!*sp->pptr);
                                if (!*sp->pptr)
                                        return NULL;
                                htb_next_rb_node(sp->pptr);
@@ -792,7 +792,7 @@ static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
                        sp->pid = cl->un.inner.last_ptr_id + prio;
                }
        }
-        BUG_TRAP(0);
+        WARN_ON(1);
        return NULL;
 }
@@ -810,7 +810,7 @@ static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio,
        do {
 next:
-                BUG_TRAP(cl);
+                WARN_ON(!cl);
                if (!cl)
                        return NULL;
@@ -1185,7 +1185,7 @@ static void htb_parent_to_leaf(struct htb_sched *q, struct htb_class *cl,
 {
        struct htb_class *parent = cl->parent;
-        BUG_TRAP(!cl->level && cl->un.leaf.q && !cl->prio_activity);
+        WARN_ON(cl->level || !cl->un.leaf.q || cl->prio_activity);
        if (parent->cmode != HTB_CAN_SEND)
                htb_safe_rb_erase(&parent->pq_node, q->wait_pq + parent->level);
@@ -1205,7 +1205,7 @@ static void htb_parent_to_leaf(struct htb_sched *q, struct htb_class *cl,
 static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl)
 {
        if (!cl->level) {
-                BUG_TRAP(cl->un.leaf.q);
+                WARN_ON(!cl->un.leaf.q);
                qdisc_destroy(cl->un.leaf.q);
        }
        gen_kill_estimator(&cl->bstats, &cl->rate_est);
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index ec2a0a33fd78..8472b8b349c4 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -464,7 +464,7 @@ static void sctp_association_destroy(struct sctp_association *asoc)
                spin_unlock_bh(&sctp_assocs_id_lock);
        }
-        BUG_TRAP(!atomic_read(&asoc->rmem_alloc));
+        WARN_ON(atomic_read(&asoc->rmem_alloc));
        if (asoc->base.malloced) {
                kfree(asoc);
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 70ead8dc3485..4328ad5439c9 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -71,6 +71,8 @@ static void sctp_mark_missing(struct sctp_outq *q,
 static void sctp_generate_fwdtsn(struct sctp_outq *q, __u32 sack_ctsn);
+static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout);
 /* Add data to the front of the queue. */
 static inline void sctp_outq_head_data(struct sctp_outq *q,
                                        struct sctp_chunk *ch)
@@ -712,7 +714,7 @@ int sctp_outq_uncork(struct sctp_outq *q)
 * locking concerns must be made.  Today we use the sock lock to protect
 * this function.
 */
-int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
+static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
 {
        struct sctp_packet *packet;
        struct sctp_packet singleton;
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 5dd89831eceb..f268910620be 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -519,8 +519,3 @@ int __init sctp_remaddr_proc_init(void)
        return 0;
 }
-void sctp_assoc_proc_exit(void)
-{
-        remove_proc_entry("remaddr", proc_net_sctp);
-}
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 79bece16aede..dbb79adf8f3c 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3910,7 +3910,7 @@ static int sctp_getsockopt_peeloff(struct sock *sk, int len, char __user *optval
                goto out;
        /* Map the socket to an unused fd that can be returned to the user.  */
-        retval = sock_map_fd(newsock);
+        retval = sock_map_fd(newsock, 0);
        if (retval < 0) {
                sock_release(newsock);
                goto out;
diff --git a/net/socket.c b/net/socket.c
index 1ba57d888981..8ef8ba81b9e2 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -63,11 +63,13 @@
 #include <linux/file.h>
 #include <linux/net.h>
 #include <linux/interrupt.h>
+#include <linux/thread_info.h>
 #include <linux/rcupdate.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
+#include <linux/thread_info.h>
 #include <linux/wanrouter.h>
 #include <linux/if_bridge.h>
 #include <linux/if_frad.h>
@@ -263,7 +265,7 @@ static void sock_destroy_inode(struct inode *inode)
                        container_of(inode, struct socket_alloc, vfs_inode));
 }
-static void init_once(struct kmem_cache *cachep, void *foo)
+static void init_once(void *foo)
 {
        struct socket_alloc *ei = (struct socket_alloc *)foo;
@@ -349,11 +351,11 @@ static struct dentry_operations sockfs_dentry_operations = {
 *      but we take care of internal coherence yet.
 */
-static int sock_alloc_fd(struct file **filep)
+static int sock_alloc_fd(struct file **filep, int flags)
 {
        int fd;
-        fd = get_unused_fd();
+        fd = get_unused_fd_flags(flags);
        if (likely(fd >= 0)) {
                struct file *file = get_empty_filp();
@@ -367,7 +369,7 @@ static int sock_alloc_fd(struct file **filep)
        return fd;
 }
-static int sock_attach_fd(struct socket *sock, struct file *file)
+static int sock_attach_fd(struct socket *sock, struct file *file, int flags)
 {
        struct dentry *dentry;
        struct qstr name = { .name = "" };
@@ -389,20 +391,20 @@ static int sock_attach_fd(struct socket *sock, struct file *file)
        init_file(file, sock_mnt, dentry, FMODE_READ | FMODE_WRITE,
                  &socket_file_ops);
        SOCK_INODE(sock)->i_fop = &socket_file_ops;
-        file->f_flags = O_RDWR;
+        file->f_flags = O_RDWR | (flags & O_NONBLOCK);
        file->f_pos = 0;
        file->private_data = sock;
        return 0;
 }
-int sock_map_fd(struct socket *sock)
+int sock_map_fd(struct socket *sock, int flags)
 {
        struct file *newfile;
-        int fd = sock_alloc_fd(&newfile);
+        int fd = sock_alloc_fd(&newfile, flags);
        if (likely(fd >= 0)) {
-                int err = sock_attach_fd(sock, newfile);
+                int err = sock_attach_fd(sock, newfile, flags);
                if (unlikely(err < 0)) {
                        put_filp(newfile);
@@ -1218,12 +1220,27 @@ asmlinkage long sys_socket(int family, int type, int protocol)
 {
        int retval;
        struct socket *sock;
+        int flags;
+        /* Check the SOCK_* constants for consistency.  */
+        BUILD_BUG_ON(SOCK_CLOEXEC != O_CLOEXEC);
+        BUILD_BUG_ON((SOCK_MAX | SOCK_TYPE_MASK) != SOCK_TYPE_MASK);
+        BUILD_BUG_ON(SOCK_CLOEXEC & SOCK_TYPE_MASK);
+        BUILD_BUG_ON(SOCK_NONBLOCK & SOCK_TYPE_MASK);
+        flags = type & ~SOCK_TYPE_MASK;
+        if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
+                return -EINVAL;
+        type &= SOCK_TYPE_MASK;
+        if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
+                flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
        retval = sock_create(family, type, protocol, &sock);
        if (retval < 0)
                goto out;
-        retval = sock_map_fd(sock);
+        retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
        if (retval < 0)
                goto out_release;
@@ -1246,6 +1263,15 @@ asmlinkage long sys_socketpair(int family, int type, int protocol,
        struct socket *sock1, *sock2;
        int fd1, fd2, err;
        struct file *newfile1, *newfile2;
+        int flags;
+        flags = type & ~SOCK_TYPE_MASK;
+        if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
+                return -EINVAL;
+        type &= SOCK_TYPE_MASK;
+        if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
+                flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
        /*
         * Obtain the first socket and check if the underlying protocol
@@ -1264,13 +1290,13 @@ asmlinkage long sys_socketpair(int family, int type, int protocol,
        if (err < 0)
                goto out_release_both;
-        fd1 = sock_alloc_fd(&newfile1);
+        fd1 = sock_alloc_fd(&newfile1, flags & O_CLOEXEC);
        if (unlikely(fd1 < 0)) {
                err = fd1;
                goto out_release_both;
        }
-        fd2 = sock_alloc_fd(&newfile2);
+        fd2 = sock_alloc_fd(&newfile2, flags & O_CLOEXEC);
        if (unlikely(fd2 < 0)) {
                err = fd2;
                put_filp(newfile1);
@@ -1278,12 +1304,12 @@ asmlinkage long sys_socketpair(int family, int type, int protocol,
                goto out_release_both;
        }
-        err = sock_attach_fd(sock1, newfile1);
+        err = sock_attach_fd(sock1, newfile1, flags & O_NONBLOCK);
        if (unlikely(err < 0)) {
                goto out_fd2;
        }
-        err = sock_attach_fd(sock2, newfile2);
+        err = sock_attach_fd(sock2, newfile2, flags & O_NONBLOCK);
        if (unlikely(err < 0)) {
                fput(newfile1);
                goto out_fd1;
@@ -1401,14 +1427,20 @@ asmlinkage long sys_listen(int fd, int backlog)
 *      clean when we restucture accept also.
 */
-asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
+long do_accept(int fd, struct sockaddr __user *upeer_sockaddr,
-                           int __user *upeer_addrlen)
+               int __user *upeer_addrlen, int flags)
 {
        struct socket *sock, *newsock;
        struct file *newfile;
        int err, len, newfd, fput_needed;
        struct sockaddr_storage address;
+        if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
+                return -EINVAL;
+        if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
+                flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
        if (!sock)
                goto out;
@@ -1426,14 +1458,14 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
         */
        __module_get(newsock->ops->owner);
-        newfd = sock_alloc_fd(&newfile);
+        newfd = sock_alloc_fd(&newfile, flags & O_CLOEXEC);
        if (unlikely(newfd < 0)) {
                err = newfd;
                sock_release(newsock);
                goto out_put;
        }
-        err = sock_attach_fd(newsock, newfile);
+        err = sock_attach_fd(newsock, newfile, flags & O_NONBLOCK);
        if (err < 0)
                goto out_fd_simple;
@@ -1479,6 +1511,66 @@ out_fd:
        goto out_put;
 }
+#ifdef HAVE_SET_RESTORE_SIGMASK
+asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
+                            int __user *upeer_addrlen,
+                            const sigset_t __user *sigmask,
+                            size_t sigsetsize, int flags)
+{
+        sigset_t ksigmask, sigsaved;
+        int ret;
+        if (sigmask) {
+                /* XXX: Don't preclude handling different sized sigset_t's.  */
+                if (sigsetsize != sizeof(sigset_t))
+                        return -EINVAL;
+                if (copy_from_user(&ksigmask, sigmask, sizeof(ksigmask)))
+                        return -EFAULT;
+                sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));
+                sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
+        }
+        ret = do_accept(fd, upeer_sockaddr, upeer_addrlen, flags);
+        if (ret < 0 && signal_pending(current)) {
+                /*
+                 * Don't restore the signal mask yet. Let do_signal() deliver
+                 * the signal on the way back to userspace, before the signal
+                 * mask is restored.
+                 */
+                if (sigmask) {
+                        memcpy(&current->saved_sigmask, &sigsaved,
+                               sizeof(sigsaved));
+                        set_restore_sigmask();
+                }
+        } else if (sigmask)
+                sigprocmask(SIG_SETMASK, &sigsaved, NULL);
+        return ret;
+}
+#else
+asmlinkage long sys_paccept(int fd, struct sockaddr __user *upeer_sockaddr,
+                            int __user *upeer_addrlen,
+                            const sigset_t __user *sigmask,
+                            size_t sigsetsize, int flags)
+{
+        /* The platform does not support restoring the signal mask in the
+         * return path.  So we do not allow using paccept() with a signal
+         * mask.  */
+        if (sigmask)
+                return -EINVAL;
+        return do_accept(fd, upeer_sockaddr, upeer_addrlen, flags);
+}
+#endif
+asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
+                           int __user *upeer_addrlen)
+{
+        return do_accept(fd, upeer_sockaddr, upeer_addrlen, 0);
+}
 /*
 *      Attempt to connect to a socket with the server address.  The address
 *      is in user space so we verify it is OK and move it to kernel space.
@@ -1999,10 +2091,11 @@ out:
 /* Argument list sizes for sys_socketcall */
 #define AL(x) ((x) * sizeof(unsigned long))
-static const unsigned char nargs[18]={
+static const unsigned char nargs[19]={
        AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
        AL(3),AL(3),AL(4),AL(4),AL(4),AL(6),
-        AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)
+        AL(6),AL(2),AL(5),AL(5),AL(3),AL(3),
+        AL(6)
 };
 #undef AL
@@ -2021,7 +2114,7 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
        unsigned long a0, a1;
        int err;
-        if (call < 1 || call > SYS_RECVMSG)
+        if (call < 1 || call > SYS_PACCEPT)
                return -EINVAL;
        /* copy_from_user should be SMP safe. */
@@ -2050,8 +2143,8 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
                break;
        case SYS_ACCEPT:
                err =
-                    sys_accept(a0, (struct sockaddr __user *)a1,
+                    do_accept(a0, (struct sockaddr __user *)a1,
-                               (int __user *)a[2]);
+                              (int __user *)a[2], 0);
                break;
        case SYS_GETSOCKNAME:
                err =
@@ -2098,6 +2191,13 @@ asmlinkage long sys_socketcall(int call, unsigned long __user *args)
        case SYS_RECVMSG:
                err = sys_recvmsg(a0, (struct msghdr __user *)a1, a[2]);
                break;
+        case SYS_PACCEPT:
+                err =
+                    sys_paccept(a0, (struct sockaddr __user *)a1,
+                                (int __user *)a[2],
+                                (const sigset_t __user *) a[3],
+                                a[4], a[5]);
+                break;
        default:
                err = -EINVAL;
                break;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 5a9b0e7828cd..23a2b8f6dc49 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -897,7 +897,7 @@ static struct file_system_type rpc_pipe_fs_type = {
 };
 static void
-init_once(struct kmem_cache * cachep, void *foo)
+init_once(void *foo)
 {
        struct rpc_inode *rpci = (struct rpc_inode *) foo;
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 5a32cb7c4bb4..835d27413083 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -310,7 +310,8 @@ svc_pool_map_set_cpumask(struct task_struct *task, unsigned int pidx)
        switch (m->mode) {
        case SVC_POOL_PERCPU:
        {
-                set_cpus_allowed_ptr(task, &cpumask_of_cpu(node));
+                cpumask_of_cpu_ptr(cpumask, node);
+                set_cpus_allowed_ptr(task, cpumask);
                break;
        }
        case SVC_POOL_PERNODE:
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index a19b22b452a3..84d328329d98 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -169,7 +169,8 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
                                          (void *)
                                          vec->sge[xdr_sge_no].iov_base + sge_off,
                                          sge_bytes, DMA_TO_DEVICE);
-                if (dma_mapping_error(sge[sge_no].addr))
+                if (dma_mapping_error(xprt->sc_cm_id->device->dma_device,
+                                        sge[sge_no].addr))
                        goto err;
                sge_off = 0;
                sge_no++;
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 007c1a6708ee..972201cd5fa7 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -29,23 +29,35 @@
 #include <linux/if_tr.h>
 #endif
-static struct list_head *
+static struct ctl_table_set *
 net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
 {
-        return &namespaces->net_ns->sysctl_table_headers;
+        return &namespaces->net_ns->sysctls;
 }
-static struct ctl_table_root net_sysctl_root = {
+static int is_seen(struct ctl_table_set *set)
-        .lookup = net_ctl_header_lookup,
+{
-};
+        return &current->nsproxy->net_ns->sysctls == set;
+}
-static LIST_HEAD(net_sysctl_ro_tables);
+/* Return standard mode bits for table entry. */
-static struct list_head *net_ctl_ro_header_lookup(struct ctl_table_root *root,
+static int net_ctl_permissions(struct ctl_table_root *root,
-                struct nsproxy *namespaces)
+                               struct nsproxy *nsproxy,
+                               struct ctl_table *table)
 {
-        return &net_sysctl_ro_tables;
+        /* Allow network administrator to have same access as root. */
+        if (capable(CAP_NET_ADMIN)) {
+                int mode = (table->mode >> 6) & 7;
+                return (mode << 6) | (mode << 3) | mode;
+        }
+        return table->mode;
 }
+static struct ctl_table_root net_sysctl_root = {
+        .lookup = net_ctl_header_lookup,
+        .permissions = net_ctl_permissions,
+};
 static int net_ctl_ro_header_perms(struct ctl_table_root *root,
                struct nsproxy *namespaces, struct ctl_table *table)
 {
@@ -56,19 +68,20 @@ static int net_ctl_ro_header_perms(struct ctl_table_root *root,
 }
 static struct ctl_table_root net_sysctl_ro_root = {
-        .lookup = net_ctl_ro_header_lookup,
        .permissions = net_ctl_ro_header_perms,
 };
 static int sysctl_net_init(struct net *net)
 {
-        INIT_LIST_HEAD(&net->sysctl_table_headers);
+        setup_sysctl_set(&net->sysctls,
+                         &net_sysctl_ro_root.default_set,
+                         is_seen);
        return 0;
 }
 static void sysctl_net_exit(struct net *net)
 {
-        WARN_ON(!list_empty(&net->sysctl_table_headers));
+        WARN_ON(!list_empty(&net->sysctls.list));
        return;
 }
@@ -84,6 +97,7 @@ static __init int sysctl_init(void)
        if (ret)
                goto out;
        register_sysctl_root(&net_sysctl_root);
+        setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL, NULL);
        register_sysctl_root(&net_sysctl_ro_root);
 out:
        return ret;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 70ceb1604ad8..015606b54d9b 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -227,7 +227,7 @@ static void __unix_remove_socket(struct sock *sk)
 static void __unix_insert_socket(struct hlist_head *list, struct sock *sk)
 {
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
        sk_add_node(sk, list);
 }
@@ -350,9 +350,9 @@ static void unix_sock_destructor(struct sock *sk)
        skb_queue_purge(&sk->sk_receive_queue);
-        BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
+        WARN_ON(atomic_read(&sk->sk_wmem_alloc));
-        BUG_TRAP(sk_unhashed(sk));
+        WARN_ON(!sk_unhashed(sk));
-        BUG_TRAP(!sk->sk_socket);
+        WARN_ON(sk->sk_socket);
        if (!sock_flag(sk, SOCK_DEAD)) {
                printk("Attempt to release alive unix socket: %p\n", sk);
                return;
@@ -603,7 +603,7 @@ static struct sock * unix_create1(struct net *net, struct socket *sock)
        u->dentry = NULL;
        u->mnt    = NULL;
        spin_lock_init(&u->lock);
-        atomic_set(&u->inflight, 0);
+        atomic_long_set(&u->inflight, 0);
        INIT_LIST_HEAD(&u->link);
        mutex_init(&u->readlock); /* single task reading lock */
        init_waitqueue_head(&u->peer_wait);
diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index ebdff3d877a1..2a27b84f740b 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -127,7 +127,7 @@ void unix_inflight(struct file *fp)
        if(s) {
                struct unix_sock *u = unix_sk(s);
                spin_lock(&unix_gc_lock);
-                if (atomic_inc_return(&u->inflight) == 1) {
+                if (atomic_long_inc_return(&u->inflight) == 1) {
                        BUG_ON(!list_empty(&u->link));
                        list_add_tail(&u->link, &gc_inflight_list);
                } else {
@@ -145,7 +145,7 @@ void unix_notinflight(struct file *fp)
                struct unix_sock *u = unix_sk(s);
                spin_lock(&unix_gc_lock);
                BUG_ON(list_empty(&u->link));
-                if (atomic_dec_and_test(&u->inflight))
+                if (atomic_long_dec_and_test(&u->inflight))
                        list_del_init(&u->link);
                unix_tot_inflight--;
                spin_unlock(&unix_gc_lock);
@@ -237,17 +237,17 @@ static void scan_children(struct sock *x, void (*func)(struct unix_sock *),
 static void dec_inflight(struct unix_sock *usk)
 {
-        atomic_dec(&usk->inflight);
+        atomic_long_dec(&usk->inflight);
 }
 static void inc_inflight(struct unix_sock *usk)
 {
-        atomic_inc(&usk->inflight);
+        atomic_long_inc(&usk->inflight);
 }
 static void inc_inflight_move_tail(struct unix_sock *u)
 {
-        atomic_inc(&u->inflight);
+        atomic_long_inc(&u->inflight);
        /*
         * If this is still a candidate, move it to the end of the
         * list, so that it's checked even if it was already passed
@@ -288,11 +288,11 @@ void unix_gc(void)
         * before the detach without atomicity guarantees.
         */
        list_for_each_entry_safe(u, next, &gc_inflight_list, link) {
-                int total_refs;
+                long total_refs;
-                int inflight_refs;
+                long inflight_refs;
                total_refs = file_count(u->sk.sk_socket->file);
-                inflight_refs = atomic_read(&u->inflight);
+                inflight_refs = atomic_long_read(&u->inflight);
                BUG_ON(inflight_refs < 1);
                BUG_ON(total_refs < inflight_refs);
@@ -324,7 +324,7 @@ void unix_gc(void)
                /* Move cursor to after the current position. */
                list_move(&cursor, &u->link);
-                if (atomic_read(&u->inflight) > 0) {
+                if (atomic_long_read(&u->inflight) > 0) {
                        list_move_tail(&u->link, &gc_inflight_list);
                        u->gc_candidate = 0;
                        scan_children(&u->sk, inc_inflight_move_tail, NULL);
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index 9201ef8ad90e..6d081674515f 100644
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -46,6 +46,12 @@ config XFRM_STATISTICS
          If unsure, say N.
+config XFRM_IPCOMP
+        tristate
+        select XFRM
+        select CRYPTO
+        select CRYPTO_DEFLATE
 config NET_KEY
        tristate "PF_KEY sockets"
        select XFRM
diff --git a/net/xfrm/Makefile b/net/xfrm/Makefile
index 332cfb0ff566..0f439a72ccab 100644
--- a/net/xfrm/Makefile
+++ b/net/xfrm/Makefile
@@ -6,4 +6,5 @@ obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \
                      xfrm_input.o xfrm_output.o xfrm_algo.o
 obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o
 obj-$(CONFIG_XFRM_USER) += xfrm_user.o
+obj-$(CONFIG_XFRM_IPCOMP) += xfrm_ipcomp.o
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 23a2cc04b8cd..96036cf2216d 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -718,7 +718,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                int end;
-                BUG_TRAP(start <= offset + len);
+                WARN_ON(start > offset + len);
                end = start + skb_shinfo(skb)->frags[i].size;
                if ((copy = end - offset) > 0) {
@@ -748,7 +748,7 @@ int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *desc,
                for (; list; list = list->next) {
                        int end;
-                        BUG_TRAP(start <= offset + len);
+                        WARN_ON(start > offset + len);
                        end = start + list->len;
                        if ((copy = end - offset) > 0) {
diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
new file mode 100644
index 000000000000..c609a4b98e15
--- /dev/null
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -0,0 +1,384 @@
+/*
+ * IP Payload Compression Protocol (IPComp) - RFC3173.
+ *
+ * Copyright (c) 2003 James Morris <jmorris@intercode.com.au>
+ * Copyright (c) 2003-2008 Herbert Xu <herbert@gondor.apana.org.au>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * Todo:
+ *   - Tunable compression parameters.
+ *   - Compression stats.
+ *   - Adaptive compression.
+ */
+#include <linux/crypto.h>
+#include <linux/err.h>
+#include <linux/gfp.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/percpu.h>
+#include <linux/smp.h>
+#include <linux/vmalloc.h>
+#include <net/ip.h>
+#include <net/ipcomp.h>
+#include <net/xfrm.h>
+struct ipcomp_tfms {
+        struct list_head list;
+        struct crypto_comp **tfms;
+        int users;
+};
+static DEFINE_MUTEX(ipcomp_resource_mutex);
+static void **ipcomp_scratches;
+static int ipcomp_scratch_users;
+static LIST_HEAD(ipcomp_tfms_list);
+static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb)
+{
+        struct ipcomp_data *ipcd = x->data;
+        const int plen = skb->len;
+        int dlen = IPCOMP_SCRATCH_SIZE;
+        const u8 *start = skb->data;
+        const int cpu = get_cpu();
+        u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
+        struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
+        int err = crypto_comp_decompress(tfm, start, plen, scratch, &dlen);
+        int len;
+        if (err)
+                goto out;
+        if (dlen < (plen + sizeof(struct ip_comp_hdr))) {
+                err = -EINVAL;
+                goto out;
+        }
+        len = dlen - plen;
+        if (len > skb_tailroom(skb))
+                len = skb_tailroom(skb);
+        skb->truesize += len;
+        __skb_put(skb, len);
+        len += plen;
+        skb_copy_to_linear_data(skb, scratch, len);
+        while ((scratch += len, dlen -= len) > 0) {
+                skb_frag_t *frag;
+                err = -EMSGSIZE;
+                if (WARN_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS))
+                        goto out;
+                frag = skb_shinfo(skb)->frags + skb_shinfo(skb)->nr_frags;
+                frag->page = alloc_page(GFP_ATOMIC);
+                err = -ENOMEM;
+                if (!frag->page)
+                        goto out;
+                len = PAGE_SIZE;
+                if (dlen < len)
+                        len = dlen;
+                memcpy(page_address(frag->page), scratch, len);
+                frag->page_offset = 0;
+                frag->size = len;
+                skb->truesize += len;
+                skb->data_len += len;
+                skb->len += len;
+                skb_shinfo(skb)->nr_frags++;
+        }
+        err = 0;
+out:
+        put_cpu();
+        return err;
+}
+int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb)
+{
+        int nexthdr;
+        int err = -ENOMEM;
+        struct ip_comp_hdr *ipch;
+        if (skb_linearize_cow(skb))
+                goto out;
+        skb->ip_summed = CHECKSUM_NONE;
+        /* Remove ipcomp header and decompress original payload */
+        ipch = (void *)skb->data;
+        nexthdr = ipch->nexthdr;
+        skb->transport_header = skb->network_header + sizeof(*ipch);
+        __skb_pull(skb, sizeof(*ipch));
+        err = ipcomp_decompress(x, skb);
+        if (err)
+                goto out;
+        err = nexthdr;
+out:
+        return err;
+}
+EXPORT_SYMBOL_GPL(ipcomp_input);
+static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb)
+{
+        struct ipcomp_data *ipcd = x->data;
+        const int plen = skb->len;
+        int dlen = IPCOMP_SCRATCH_SIZE;
+        u8 *start = skb->data;
+        const int cpu = get_cpu();
+        u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
+        struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
+        int err;
+        local_bh_disable();
+        err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
+        local_bh_enable();
+        if (err)
+                goto out;
+        if ((dlen + sizeof(struct ip_comp_hdr)) >= plen) {
+                err = -EMSGSIZE;
+                goto out;
+        }
+        memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen);
+        put_cpu();
+        pskb_trim(skb, dlen + sizeof(struct ip_comp_hdr));
+        return 0;
+out:
+        put_cpu();
+        return err;
+}
+int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb)
+{
+        int err;
+        struct ip_comp_hdr *ipch;
+        struct ipcomp_data *ipcd = x->data;
+        if (skb->len < ipcd->threshold) {
+                /* Don't bother compressing */
+                goto out_ok;
+        }
+        if (skb_linearize_cow(skb))
+                goto out_ok;
+        err = ipcomp_compress(x, skb);
+        if (err) {
+                goto out_ok;
+        }
+        /* Install ipcomp header, convert into ipcomp datagram. */
+        ipch = ip_comp_hdr(skb);
+        ipch->nexthdr = *skb_mac_header(skb);
+        ipch->flags = 0;
+        ipch->cpi = htons((u16 )ntohl(x->id.spi));
+        *skb_mac_header(skb) = IPPROTO_COMP;
+out_ok:
+        skb_push(skb, -skb_network_offset(skb));
+        return 0;
+}
+EXPORT_SYMBOL_GPL(ipcomp_output);
+static void ipcomp_free_scratches(void)
+{
+        int i;
+        void **scratches;
+        if (--ipcomp_scratch_users)
+                return;
+        scratches = ipcomp_scratches;
+        if (!scratches)
+                return;
+        for_each_possible_cpu(i)
+                vfree(*per_cpu_ptr(scratches, i));
+        free_percpu(scratches);
+}
+static void **ipcomp_alloc_scratches(void)
+{
+        int i;
+        void **scratches;
+        if (ipcomp_scratch_users++)
+                return ipcomp_scratches;
+        scratches = alloc_percpu(void *);
+        if (!scratches)
+                return NULL;
+        ipcomp_scratches = scratches;
+        for_each_possible_cpu(i) {
+                void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE);
+                if (!scratch)
+                        return NULL;
+                *per_cpu_ptr(scratches, i) = scratch;
+        }
+        return scratches;
+}
+static void ipcomp_free_tfms(struct crypto_comp **tfms)
+{
+        struct ipcomp_tfms *pos;
+        int cpu;
+        list_for_each_entry(pos, &ipcomp_tfms_list, list) {
+                if (pos->tfms == tfms)
+                        break;
+        }
+        WARN_ON(!pos);
+        if (--pos->users)
+                return;
+        list_del(&pos->list);
+        kfree(pos);
+        if (!tfms)
+                return;
+        for_each_possible_cpu(cpu) {
+                struct crypto_comp *tfm = *per_cpu_ptr(tfms, cpu);
+                crypto_free_comp(tfm);
+        }
+        free_percpu(tfms);
+}
+static struct crypto_comp **ipcomp_alloc_tfms(const char *alg_name)
+{
+        struct ipcomp_tfms *pos;
+        struct crypto_comp **tfms;
+        int cpu;
+        /* This can be any valid CPU ID so we don't need locking. */
+        cpu = raw_smp_processor_id();
+        list_for_each_entry(pos, &ipcomp_tfms_list, list) {
+                struct crypto_comp *tfm;
+                tfms = pos->tfms;
+                tfm = *per_cpu_ptr(tfms, cpu);
+                if (!strcmp(crypto_comp_name(tfm), alg_name)) {
+                        pos->users++;
+                        return tfms;
+                }
+        }
+        pos = kmalloc(sizeof(*pos), GFP_KERNEL);
+        if (!pos)
+                return NULL;
+        pos->users = 1;
+        INIT_LIST_HEAD(&pos->list);
+        list_add(&pos->list, &ipcomp_tfms_list);
+        pos->tfms = tfms = alloc_percpu(struct crypto_comp *);
+        if (!tfms)
+                goto error;
+        for_each_possible_cpu(cpu) {
+                struct crypto_comp *tfm = crypto_alloc_comp(alg_name, 0,
+                                                            CRYPTO_ALG_ASYNC);
+                if (IS_ERR(tfm))
+                        goto error;
+                *per_cpu_ptr(tfms, cpu) = tfm;
+        }
+        return tfms;
+error:
+        ipcomp_free_tfms(tfms);
+        return NULL;
+}
+static void ipcomp_free_data(struct ipcomp_data *ipcd)
+{
+        if (ipcd->tfms)
+                ipcomp_free_tfms(ipcd->tfms);
+        ipcomp_free_scratches();
+}
+void ipcomp_destroy(struct xfrm_state *x)
+{
+        struct ipcomp_data *ipcd = x->data;
+        if (!ipcd)
+                return;
+        xfrm_state_delete_tunnel(x);
+        mutex_lock(&ipcomp_resource_mutex);
+        ipcomp_free_data(ipcd);
+        mutex_unlock(&ipcomp_resource_mutex);
+        kfree(ipcd);
+}
+EXPORT_SYMBOL_GPL(ipcomp_destroy);
+int ipcomp_init_state(struct xfrm_state *x)
+{
+        int err;
+        struct ipcomp_data *ipcd;
+        struct xfrm_algo_desc *calg_desc;
+        err = -EINVAL;
+        if (!x->calg)
+                goto out;
+        if (x->encap)
+                goto out;
+        err = -ENOMEM;
+        ipcd = kzalloc(sizeof(*ipcd), GFP_KERNEL);
+        if (!ipcd)
+                goto out;
+        mutex_lock(&ipcomp_resource_mutex);
+        if (!ipcomp_alloc_scratches())
+                goto error;
+        ipcd->tfms = ipcomp_alloc_tfms(x->calg->alg_name);
+        if (!ipcd->tfms)
+                goto error;
+        mutex_unlock(&ipcomp_resource_mutex);
+        calg_desc = xfrm_calg_get_byname(x->calg->alg_name, 0);
+        BUG_ON(!calg_desc);
+        ipcd->threshold = calg_desc->uinfo.comp.threshold;
+        x->data = ipcd;
+        err = 0;
+out:
+        return err;
+error:
+        ipcomp_free_data(ipcd);
+        mutex_unlock(&ipcomp_resource_mutex);
+        kfree(ipcd);
+        goto out;
+}
+EXPORT_SYMBOL_GPL(ipcomp_init_state);
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) - RFC3173");
+MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 72fddafd891a..4c6914ef7d92 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -538,7 +538,7 @@ EXPORT_SYMBOL(xfrm_state_alloc);
 void __xfrm_state_destroy(struct xfrm_state *x)
 {
-        BUG_TRAP(x->km.state == XFRM_STATE_DEAD);
+        WARN_ON(x->km.state != XFRM_STATE_DEAD);
        spin_lock_bh(&xfrm_state_lock);
        list_del(&x->all);
author	Ingo Molnar <mingo@elte.hu>	2008-07-28 10:26:31 -0400
committer	Ingo Molnar <mingo@elte.hu>	2008-07-28 10:26:31 -0400
commit	b7d0b6784565b846f3562608dfb3cf8516718724 (patch)
tree	50a4931ce7e62e78b664bb8f43da2f4508c319f9 /net
parent	cdcf772ed163651cacac8098b4974aba7f9e1c73 (diff)
parent	c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff)