42 files changed, 171 insertions, 166 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index daad0064e2c2..08b54b593d56 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -176,12 +176,11 @@ int vlan_proc_add_dev(struct net_device *vlandev)
        struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
        struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id);
-        dev_info->dent = proc_create(vlandev->name, S_IFREG|S_IRUSR|S_IWUSR,
+        dev_info->dent =
-                                     vn->proc_vlan_dir, &vlandev_fops);
+                proc_create_data(vlandev->name, S_IFREG|S_IRUSR|S_IWUSR,
+                                 vn->proc_vlan_dir, &vlandev_fops, vlandev);
        if (!dev_info->dent)
                return -ENOBUFS;
-        dev_info->dent->data = vlandev;
        return 0;
 }
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 5c9f3d148135..49487b313f22 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -417,12 +417,10 @@ int atm_proc_dev_register(struct atm_dev *dev)
                goto err_out;
        sprintf(dev->proc_name,"%s:%d",dev->type, dev->number);
-        dev->proc_entry = proc_create(dev->proc_name, 0, atm_proc_root,
+        dev->proc_entry = proc_create_data(dev->proc_name, 0, atm_proc_root,
-                                      &proc_atm_dev_ops);
+                                           &proc_atm_dev_ops, dev);
        if (!dev->proc_entry)
                goto err_free_name;
-        dev->proc_entry->data = dev;
-        dev->proc_entry->owner = THIS_MODULE;
        return 0;
 err_free_name:
        kfree(dev->proc_name);
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 347e935faaf0..f85d94643aaf 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -135,7 +135,7 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len
        if (len < 2)
                return -EILSEQ;
-        n = ntohs(get_unaligned(data));
+        n = get_unaligned_be16(data);
        data++; len -= 2;
        if (len < n)
@@ -150,8 +150,8 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len
                int i;
                for (i = 0; i < n; i++) {
-                        f[i].start = ntohs(get_unaligned(data++));
+                        f[i].start = get_unaligned_be16(data++);
-                        f[i].end   = ntohs(get_unaligned(data++));
+                        f[i].end   = get_unaligned_be16(data++);
                        BT_DBG("proto filter start %d end %d",
                                f[i].start, f[i].end);
@@ -180,7 +180,7 @@ static int bnep_ctrl_set_mcfilter(struct bnep_session *s, u8 *data, int len)
        if (len < 2)
                return -EILSEQ;
-        n = ntohs(get_unaligned((__be16 *) data));
+        n = get_unaligned_be16(data);
        data += 2; len -= 2;
        if (len < n)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 46df2e403df8..6aef8f24e581 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -129,8 +129,7 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
        conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle));
        if (conn) {
-                __le16 policy = get_unaligned((__le16 *) (sent + 2));
+                conn->link_policy = get_unaligned_le16(sent + 2);
-                conn->link_policy = __le16_to_cpu(policy);
        }
        hci_dev_unlock(hdev);
@@ -313,7 +312,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb
                return;
        if (!status) {
-                __u16 setting = __le16_to_cpu(get_unaligned((__le16 *) sent));
+                __u16 setting = get_unaligned_le16(sent);
                if (hdev->voice_setting != setting) {
                        hdev->voice_setting = setting;
@@ -1152,8 +1151,8 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
                struct hci_conn *conn;
                __u16  handle, count;
-                handle = __le16_to_cpu(get_unaligned(ptr++));
+                handle = get_unaligned_le16(ptr++);
-                count  = __le16_to_cpu(get_unaligned(ptr++));
+                count  = get_unaligned_le16(ptr++);
                conn = hci_conn_hash_lookup_handle(hdev, handle);
                if (conn) {
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 1d36c093523b..747fabd735d2 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -440,7 +440,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
        skb->dev = (void *) hdev;
        if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {
-                u16 opcode = __le16_to_cpu(get_unaligned((__le16 *) skb->data));
+                u16 opcode = get_unaligned_le16(skb->data);
                u16 ogf = hci_opcode_ogf(opcode);
                u16 ocf = hci_opcode_ocf(opcode);
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index a4849f2c1d81..6e180d255505 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1827,7 +1827,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm
        del_timer(&conn->info_timer);
        if (type == L2CAP_IT_FEAT_MASK)
-                conn->feat_mask = __le32_to_cpu(get_unaligned((__le32 *) rsp->data));
+                conn->feat_mask = get_unaligned_le32(rsp->data);
        l2cap_conn_start(conn);
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 9326c377822e..72c5976a5ce3 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -285,7 +285,11 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,
                        /* convert from internal format to API */
                        memcpy(fe->mac_addr, f->addr.addr, ETH_ALEN);
+                        /* due to ABI compat need to split into hi/lo */
                        fe->port_no = f->dst->port_no;
+                        fe->port_hi = f->dst->port_no >> 8;
                        fe->is_local = f->is_local;
                        if (!f->is_static)
                                fe->ageing_timer_value = jiffies_to_clock_t(jiffies - f->ageing_timer);
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 8deab645ef75..ddeb6e5d45d6 100644
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -58,12 +58,12 @@ static inline void br_set_ticks(unsigned char *dest, int j)
 {
        unsigned long ticks = (STP_HZ * j)/ HZ;
-        put_unaligned(htons(ticks), (__be16 *)dest);
+        put_unaligned_be16(ticks, dest);
 }
 static inline int br_get_ticks(const unsigned char *src)
 {
-        unsigned long ticks = ntohs(get_unaligned((__be16 *)src));
+        unsigned long ticks = get_unaligned_be16(src);
        return DIV_ROUND_UP(ticks * HZ, STP_HZ);
 }
diff --git a/net/core/dev.c b/net/core/dev.c
index ed49da592051..d334446a8eaf 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -162,7 +162,7 @@ struct net_dma {
        struct dma_client client;
        spinlock_t lock;
        cpumask_t channel_mask;
-        struct dma_chan *channels[NR_CPUS];
+        struct dma_chan **channels;
 };
 static enum dma_state_client
@@ -2444,7 +2444,7 @@ static struct netif_rx_stats *softnet_get_online(loff_t *pos)
 {
        struct netif_rx_stats *rc = NULL;
-        while (*pos < NR_CPUS)
+        while (*pos < nr_cpu_ids)
                if (cpu_online(*pos)) {
                        rc = &per_cpu(netdev_rx_stat, *pos);
                        break;
@@ -3776,6 +3776,7 @@ int register_netdevice(struct net_device *dev)
                }
        }
+        netdev_initialize_kobject(dev);
        ret = netdev_register_kobject(dev);
        if (ret)
                goto err_uninit;
@@ -4208,7 +4209,8 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
        }
        /* Fixup kobjects */
-        err = device_rename(&dev->dev, dev->name);
+        netdev_unregister_kobject(dev);
+        err = netdev_register_kobject(dev);
        WARN_ON(err);
        /* Add the device back in the hashes */
@@ -4324,7 +4326,7 @@ netdev_dma_event(struct dma_client *client, struct dma_chan *chan,
        spin_lock(&net_dma->lock);
        switch (state) {
        case DMA_RESOURCE_AVAILABLE:
-                for (i = 0; i < NR_CPUS; i++)
+                for (i = 0; i < nr_cpu_ids; i++)
                        if (net_dma->channels[i] == chan) {
                                found = 1;
                                break;
@@ -4339,7 +4341,7 @@ netdev_dma_event(struct dma_client *client, struct dma_chan *chan,
                }
                break;
        case DMA_RESOURCE_REMOVED:
-                for (i = 0; i < NR_CPUS; i++)
+                for (i = 0; i < nr_cpu_ids; i++)
                        if (net_dma->channels[i] == chan) {
                                found = 1;
                                pos = i;
@@ -4366,6 +4368,13 @@ netdev_dma_event(struct dma_client *client, struct dma_chan *chan,
 */
 static int __init netdev_dma_register(void)
 {
+        net_dma.channels = kzalloc(nr_cpu_ids * sizeof(struct net_dma),
+                                                                GFP_KERNEL);
+        if (unlikely(!net_dma.channels)) {
+                printk(KERN_NOTICE
+                                "netdev_dma: no memory for net_dma.channels\n");
+                return -ENOMEM;
+        }
        spin_lock_init(&net_dma.lock);
        dma_cap_set(DMA_MEMCPY, net_dma.client.cap_mask);
        dma_async_client_register(&net_dma.client);
diff --git a/net/core/filter.c b/net/core/filter.c
index f5f3cf603064..4f8369729a4e 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -213,7 +213,7 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 load_w:
                        ptr = load_pointer(skb, k, 4, &tmp);
                        if (ptr != NULL) {
-                                A = ntohl(get_unaligned((__be32 *)ptr));
+                                A = get_unaligned_be32(ptr);
                                continue;
                        }
                        break;
@@ -222,7 +222,7 @@ load_w:
 load_h:
                        ptr = load_pointer(skb, k, 2, &tmp);
                        if (ptr != NULL) {
-                                A = ntohs(get_unaligned((__be16 *)ptr));
+                                A = get_unaligned_be16(ptr);
                                continue;
                        }
                        break;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 75075c303c44..5d9d7130bd6e 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1430,11 +1430,10 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
                panic("cannot create neighbour cache statistics");
 #ifdef CONFIG_PROC_FS
-        tbl->pde = proc_create(tbl->id, 0, init_net.proc_net_stat,
+        tbl->pde = proc_create_data(tbl->id, 0, init_net.proc_net_stat,
-                               &neigh_stat_seq_fops);
+                                    &neigh_stat_seq_fops, tbl);
        if (!tbl->pde)
                panic("cannot create neighbour proc dir entry");
-        tbl->pde->data = tbl;
 #endif
        tbl->hash_mask = 1;
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 4e7b847347f7..90e2177af081 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -449,7 +449,6 @@ int netdev_register_kobject(struct net_device *net)
        struct device *dev = &(net->dev);
        struct attribute_group **groups = net->sysfs_groups;
-        device_initialize(dev);
        dev->class = &net_class;
        dev->platform_data = net;
        dev->groups = groups;
@@ -470,6 +469,12 @@ int netdev_register_kobject(struct net_device *net)
        return device_add(dev);
 }
+void netdev_initialize_kobject(struct net_device *net)
+{
+        struct device *device = &(net->dev);
+        device_initialize(device);
+}
 int netdev_kobject_init(void)
 {
        return class_register(&net_class);
diff --git a/net/core/net-sysfs.h b/net/core/net-sysfs.h
index f5f108db3924..14e7524260b3 100644
--- a/net/core/net-sysfs.h
+++ b/net/core/net-sysfs.h
@@ -4,5 +4,5 @@
 int netdev_kobject_init(void);
 int netdev_register_kobject(struct net_device *);
 void netdev_unregister_kobject(struct net_device *);
+void netdev_initialize_kobject(struct net_device *);
 #endif
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index a803b442234c..8dca21110493 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3570,15 +3570,14 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
        if (err)
                goto out1;
-        pkt_dev->entry = proc_create(ifname, 0600,
+        pkt_dev->entry = proc_create_data(ifname, 0600, pg_proc_dir,
-                                     pg_proc_dir, &pktgen_if_fops);
+                                          &pktgen_if_fops, pkt_dev);
        if (!pkt_dev->entry) {
                printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
                       PG_PROC_DIR, ifname);
                err = -EINVAL;
                goto out2;
        }
-        pkt_dev->entry->data = pkt_dev;
 #ifdef CONFIG_XFRM
        pkt_dev->ipsmode = XFRM_MODE_TRANSPORT;
        pkt_dev->ipsproto = IPPROTO_ESP;
@@ -3628,7 +3627,8 @@ static int __init pktgen_create_thread(int cpu)
        kthread_bind(p, cpu);
        t->tsk = p;
-        pe = proc_create(t->tsk->comm, 0600, pg_proc_dir, &pktgen_thread_fops);
+        pe = proc_create_data(t->tsk->comm, 0600, pg_proc_dir,
+                              &pktgen_thread_fops, t);
        if (!pe) {
                printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
                       PG_PROC_DIR, t->tsk->comm);
@@ -3638,8 +3638,6 @@ static int __init pktgen_create_thread(int cpu)
                return -EINVAL;
        }
-        pe->data = t;
        wake_up_process(p);
        return 0;
@@ -3716,8 +3714,6 @@ static int __init pg_init(void)
                return -EINVAL;
        }
-        pe->data = NULL;
        /* Register us to receive netdevice events */
        register_netdevice_notifier(&pktgen_notifier_block);
diff --git a/net/core/sock.c b/net/core/sock.c
index 5dbb81bc9673..fa76f04fa9c6 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -228,11 +228,12 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)
                static int warned __read_mostly;
                *timeo_p = 0;
-                if (warned < 10 && net_ratelimit())
+                if (warned < 10 && net_ratelimit()) {
                        warned++;
                        printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) "
                               "tries to set negative timeout\n",
                                current->comm, task_pid_nr(current));
+                }
                return 0;
        }
        *timeo_p = MAX_SCHEDULE_TIMEOUT;
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index b5b52ebb2693..8e9580874216 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -716,7 +716,7 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
         * packets for new connections, following the rules from [RFC3390]".
         * We need to convert the bytes of RFC3390 into the packets of RFC 4341.
         */
-        hctx->ccid2hctx_cwnd = min(4U, max(2U, 4380U / dp->dccps_mss_cache));
+        hctx->ccid2hctx_cwnd = clamp(4380U / dp->dccps_mss_cache, 2U, 4U);
        /* Make sure that Ack Ratio is enabled and within bounds. */
        max_ratio = DIV_ROUND_UP(hctx->ccid2hctx_cwnd, 2);
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index e76f460af0ea..cd61dea2eea1 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -88,8 +88,8 @@ static void ccid3_hc_tx_set_state(struct sock *sk,
 static inline u64 rfc3390_initial_rate(struct sock *sk)
 {
        const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
-        const __u32 w_init = min_t(__u32, 4 * hctx->ccid3hctx_s,
+        const __u32 w_init = clamp_t(__u32, 4380U,
-                                   max_t(__u32, 2 * hctx->ccid3hctx_s, 4380));
+                        2 * hctx->ccid3hctx_s, 4 * hctx->ccid3hctx_s);
        return scaled_div(w_init << 6, hctx->ccid3hctx_rtt);
 }
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 4637ded3dba8..05afb576d935 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -983,7 +983,7 @@ static int cipso_v4_map_cat_enum_valid(const struct cipso_v4_doi *doi_def,
                return -EFAULT;
        for (iter = 0; iter < enumcat_len; iter += 2) {
-                cat = ntohs(get_unaligned((__be16 *)&enumcat[iter]));
+                cat = get_unaligned_be16(&enumcat[iter]);
                if (cat <= cat_prev)
                        return -EFAULT;
                cat_prev = cat;
@@ -1052,7 +1052,7 @@ static int cipso_v4_map_cat_enum_ntoh(const struct cipso_v4_doi *doi_def,
        for (iter = 0; iter < net_cat_len; iter += 2) {
                ret_val = netlbl_secattr_catmap_setbit(secattr->attr.mls.cat,
-                                ntohs(get_unaligned((__be16 *)&net_cat[iter])),
+                                get_unaligned_be16(&net_cat[iter]),
                                GFP_ATOMIC);
                if (ret_val != 0)
                        return ret_val;
@@ -1086,10 +1086,9 @@ static int cipso_v4_map_cat_rng_valid(const struct cipso_v4_doi *doi_def,
                return -EFAULT;
        for (iter = 0; iter < rngcat_len; iter += 4) {
-                cat_high = ntohs(get_unaligned((__be16 *)&rngcat[iter]));
+                cat_high = get_unaligned_be16(&rngcat[iter]);
                if ((iter + 4) <= rngcat_len)
-                        cat_low = ntohs(
+                        cat_low = get_unaligned_be16(&rngcat[iter + 2]);
-                                get_unaligned((__be16 *)&rngcat[iter + 2]));
                else
                        cat_low = 0;
@@ -1188,10 +1187,9 @@ static int cipso_v4_map_cat_rng_ntoh(const struct cipso_v4_doi *doi_def,
        u16 cat_high;
        for (net_iter = 0; net_iter < net_cat_len; net_iter += 4) {
-                cat_high = ntohs(get_unaligned((__be16 *)&net_cat[net_iter]));
+                cat_high = get_unaligned_be16(&net_cat[net_iter]);
                if ((net_iter + 4) <= net_cat_len)
-                        cat_low = ntohs(
+                        cat_low = get_unaligned_be16(&net_cat[net_iter + 2]);
-                              get_unaligned((__be16 *)&net_cat[net_iter + 2]));
                else
                        cat_low = 0;
@@ -1562,7 +1560,7 @@ int cipso_v4_validate(unsigned char **option)
        }
        rcu_read_lock();
-        doi_def = cipso_v4_doi_search(ntohl(get_unaligned((__be32 *)&opt[2])));
+        doi_def = cipso_v4_doi_search(get_unaligned_be32(&opt[2]));
        if (doi_def == NULL) {
                err_offset = 2;
                goto validate_return_locked;
@@ -1843,7 +1841,7 @@ static int cipso_v4_getattr(const unsigned char *cipso,
        if (cipso_v4_cache_check(cipso, cipso[1], secattr) == 0)
                return 0;
-        doi = ntohl(get_unaligned((__be32 *)&cipso[2]));
+        doi = get_unaligned_be32(&cipso[2]);
        rcu_read_lock();
        doi_def = cipso_v4_doi_search(doi);
        if (doi_def == NULL)
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 22d8e7cd9197..1819ad7ab910 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -169,14 +169,14 @@ clusterip_config_init(const struct ipt_clusterip_tgt_info *i, __be32 ip,
                /* create proc dir entry */
                sprintf(buffer, "%u.%u.%u.%u", NIPQUAD(ip));
-                c->pde = proc_create(buffer, S_IWUSR|S_IRUSR,
+                c->pde = proc_create_data(buffer, S_IWUSR|S_IRUSR,
-                                     clusterip_procdir, &clusterip_proc_fops);
+                                          clusterip_procdir,
+                                          &clusterip_proc_fops, c);
                if (!c->pde) {
                        kfree(c);
                        return NULL;
                }
        }
-        c->pde->data = c;
 #endif
        write_lock_bh(&clusterip_lock);
diff --git a/net/ipv4/tcp_hybla.c b/net/ipv4/tcp_hybla.c
index 44618b675916..bfcbd148a89d 100644
--- a/net/ipv4/tcp_hybla.c
+++ b/net/ipv4/tcp_hybla.c
@@ -101,8 +101,10 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
        if (!tcp_is_cwnd_limited(sk, in_flight))
                return;
-        if (!ca->hybla_en)
+        if (!ca->hybla_en) {
-                return tcp_reno_cong_avoid(sk, ack, in_flight);
+                tcp_reno_cong_avoid(sk, ack, in_flight);
+                return;
+        }
        if (ca->rho == 0)
                hybla_recalc_param(sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 0298f80681f2..eda4f4a233f3 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1172,8 +1172,8 @@ static int tcp_check_dsack(struct tcp_sock *tp, struct sk_buff *ack_skb,
                           struct tcp_sack_block_wire *sp, int num_sacks,
                           u32 prior_snd_una)
 {
-        u32 start_seq_0 = ntohl(get_unaligned(&sp[0].start_seq));
+        u32 start_seq_0 = get_unaligned_be32(&sp[0].start_seq);
-        u32 end_seq_0 = ntohl(get_unaligned(&sp[0].end_seq));
+        u32 end_seq_0 = get_unaligned_be32(&sp[0].end_seq);
        int dup_sack = 0;
        if (before(start_seq_0, TCP_SKB_CB(ack_skb)->ack_seq)) {
@@ -1181,8 +1181,8 @@ static int tcp_check_dsack(struct tcp_sock *tp, struct sk_buff *ack_skb,
                tcp_dsack_seen(tp);
                NET_INC_STATS_BH(LINUX_MIB_TCPDSACKRECV);
        } else if (num_sacks > 1) {
-                u32 end_seq_1 = ntohl(get_unaligned(&sp[1].end_seq));
+                u32 end_seq_1 = get_unaligned_be32(&sp[1].end_seq);
-                u32 start_seq_1 = ntohl(get_unaligned(&sp[1].start_seq));
+                u32 start_seq_1 = get_unaligned_be32(&sp[1].start_seq);
                if (!after(end_seq_0, end_seq_1) &&
                    !before(start_seq_0, start_seq_1)) {
@@ -1453,8 +1453,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb,
        for (i = 0; i < num_sacks; i++) {
                int dup_sack = !i && found_dup_sack;
-                sp[used_sacks].start_seq = ntohl(get_unaligned(&sp_wire[i].start_seq));
+                sp[used_sacks].start_seq = get_unaligned_be32(&sp_wire[i].start_seq);
-                sp[used_sacks].end_seq = ntohl(get_unaligned(&sp_wire[i].end_seq));
+                sp[used_sacks].end_seq = get_unaligned_be32(&sp_wire[i].end_seq);
                if (!tcp_is_sackblock_valid(tp, dup_sack,
                                            sp[used_sacks].start_seq,
@@ -3340,7 +3340,7 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                        switch (opcode) {
                        case TCPOPT_MSS:
                                if (opsize == TCPOLEN_MSS && th->syn && !estab) {
-                                        u16 in_mss = ntohs(get_unaligned((__be16 *)ptr));
+                                        u16 in_mss = get_unaligned_be16(ptr);
                                        if (in_mss) {
                                                if (opt_rx->user_mss &&
                                                    opt_rx->user_mss < in_mss)
@@ -3369,8 +3369,8 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                    ((estab && opt_rx->tstamp_ok) ||
                                     (!estab && sysctl_tcp_timestamps))) {
                                        opt_rx->saw_tstamp = 1;
-                                        opt_rx->rcv_tsval = ntohl(get_unaligned((__be32 *)ptr));
+                                        opt_rx->rcv_tsval = get_unaligned_be32(ptr);
-                                        opt_rx->rcv_tsecr = ntohl(get_unaligned((__be32 *)(ptr+4)));
+                                        opt_rx->rcv_tsecr = get_unaligned_be32(ptr + 4);
                                }
                                break;
                        case TCPOPT_SACK_PERM:
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 0e9bc120707d..cd601a866c2f 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2214,9 +2214,6 @@ static int tcp_seq_open(struct inode *inode, struct file *file)
        struct tcp_iter_state *s;
        int err;
-        if (unlikely(afinfo == NULL))
-                return -EINVAL;
        err = seq_open_net(inode, file, &afinfo->seq_ops,
                          sizeof(struct tcp_iter_state));
        if (err < 0)
@@ -2241,10 +2238,9 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
        afinfo->seq_ops.next            = tcp_seq_next;
        afinfo->seq_ops.stop            = tcp_seq_stop;
-        p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops);
+        p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
-        if (p)
+                             &afinfo->seq_fops, afinfo);
-                p->data = afinfo;
+        if (!p)
-        else
                rc = -ENOMEM;
        return rc;
 }
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 0e1a8c91f78e..14504dada116 100644
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -167,8 +167,10 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
        struct tcp_sock *tp = tcp_sk(sk);
        struct vegas *vegas = inet_csk_ca(sk);
-        if (!vegas->doing_vegas_now)
+        if (!vegas->doing_vegas_now) {
-                return tcp_reno_cong_avoid(sk, ack, in_flight);
+                tcp_reno_cong_avoid(sk, ack, in_flight);
+                return;
+        }
        /* The key players are v_beg_snd_una and v_beg_snd_nxt.
         *
diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
index 2bf618a3b00b..d08b2e855c22 100644
--- a/net/ipv4/tcp_veno.c
+++ b/net/ipv4/tcp_veno.c
@@ -119,8 +119,10 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
        struct tcp_sock *tp = tcp_sk(sk);
        struct veno *veno = inet_csk_ca(sk);
-        if (!veno->doing_veno_now)
+        if (!veno->doing_veno_now) {
-                return tcp_reno_cong_avoid(sk, ack, in_flight);
+                tcp_reno_cong_avoid(sk, ack, in_flight);
+                return;
+        }
        /* limited by applications */
        if (!tcp_is_cwnd_limited(sk, in_flight))
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 1f535e315188..db1cb7c96d63 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1605,10 +1605,9 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
        afinfo->seq_ops.next            = udp_seq_next;
        afinfo->seq_ops.stop            = udp_seq_stop;
-        p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops);
+        p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
-        if (p)
+                             &afinfo->seq_fops, afinfo);
-                p->data = afinfo;
+        if (!p)
-        else
                rc = -ENOMEM;
        return rc;
 }
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index ca8b82f96fe5..df0736a4cafa 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -247,13 +247,11 @@ int snmp6_register_dev(struct inet6_dev *idev)
        if (!proc_net_devsnmp6)
                return -ENOENT;
-        p = proc_create(idev->dev->name, S_IRUGO,
+        p = proc_create_data(idev->dev->name, S_IRUGO,
-                        proc_net_devsnmp6, &snmp6_seq_fops);
+                             proc_net_devsnmp6, &snmp6_seq_fops, idev);
        if (!p)
                return -ENOMEM;
-        p->data = idev;
        idev->stats.proc_dir_entry = p;
        return 0;
 }
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 7b247e3a16fe..798cabc7535b 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -197,6 +197,7 @@ static void ip6_frag_expire(unsigned long data)
 {
        struct frag_queue *fq;
        struct net_device *dev = NULL;
+        struct net *net;
        fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);
@@ -207,7 +208,8 @@ static void ip6_frag_expire(unsigned long data)
        fq_kill(fq);
-        dev = dev_get_by_index(&init_net, fq->iif);
+        net = container_of(fq->q.net, struct net, ipv6.frags);
+        dev = dev_get_by_index(net, fq->iif);
        if (!dev)
                goto out;
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 9e15c82960fe..4a105dc32dcd 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -451,12 +451,14 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
        n = 2;
        /* Get length, MSB first */
-        len = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2;
+        len = get_unaligned_be16(fp + n);
+        n += 2;
        IRDA_DEBUG(4, "%s(), len=%d\n", __func__, len);
        /* Get object ID, MSB first */
-        obj_id = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2;
+        obj_id = get_unaligned_be16(fp + n);
+        n += 2;
        type = fp[n++];
        IRDA_DEBUG(4, "%s(), Value type = %d\n", __func__, type);
@@ -506,7 +508,7 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
                value = irias_new_string_value(fp+n);
                break;
        case IAS_OCT_SEQ:
-                value_len = be16_to_cpu(get_unaligned((__be16 *)(fp+n)));
+                value_len = get_unaligned_be16(fp + n);
                n += 2;
                /* Will truncate to IAS_MAX_OCTET_STRING bytes */
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 8e53ce7ed444..c7314bf4bec2 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -354,7 +354,7 @@ struct ieee80211_if_sta {
        int preq_queue_len;
        struct mesh_stats mshstats;
        struct mesh_config mshcfg;
-        u8 mesh_seqnum[3];
+        u32 mesh_seqnum;
        bool accepting_plinks;
 #endif
        u16 aid;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index e9a978979d38..9ad4e3631b6b 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -255,22 +255,8 @@ static int ieee80211_open(struct net_device *dev)
        switch (sdata->vif.type) {
        case IEEE80211_IF_TYPE_WDS:
-                if (is_zero_ether_addr(sdata->u.wds.remote_addr))
+                if (!is_valid_ether_addr(sdata->u.wds.remote_addr))
                        return -ENOLINK;
-                /* Create STA entry for the WDS peer */
-                sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
-                                     GFP_KERNEL);
-                if (!sta)
-                        return -ENOMEM;
-                sta->flags |= WLAN_STA_AUTHORIZED;
-                res = sta_info_insert(sta);
-                if (res) {
-                        /* STA has been freed */
-                        return res;
-                }
                break;
        case IEEE80211_IF_TYPE_VLAN:
                if (!sdata->u.vlan.ap)
@@ -337,10 +323,8 @@ static int ieee80211_open(struct net_device *dev)
                conf.type = sdata->vif.type;
                conf.mac_addr = dev->dev_addr;
                res = local->ops->add_interface(local_to_hw(local), &conf);
-                if (res && !local->open_count && local->ops->stop)
-                        local->ops->stop(local_to_hw(local));
                if (res)
-                        return res;
+                        goto err_stop;
                ieee80211_if_config(dev);
                ieee80211_reset_erp_info(dev);
@@ -353,9 +337,29 @@ static int ieee80211_open(struct net_device *dev)
                        netif_carrier_on(dev);
        }
+        if (sdata->vif.type == IEEE80211_IF_TYPE_WDS) {
+                /* Create STA entry for the WDS peer */
+                sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
+                                     GFP_KERNEL);
+                if (!sta) {
+                        res = -ENOMEM;
+                        goto err_del_interface;
+                }
+                sta->flags |= WLAN_STA_AUTHORIZED;
+                res = sta_info_insert(sta);
+                if (res) {
+                        /* STA has been freed */
+                        goto err_del_interface;
+                }
+        }
        if (local->open_count == 0) {
                res = dev_open(local->mdev);
                WARN_ON(res);
+                if (res)
+                        goto err_del_interface;
                tasklet_enable(&local->tx_pending_tasklet);
                tasklet_enable(&local->tasklet);
        }
@@ -390,6 +394,12 @@ static int ieee80211_open(struct net_device *dev)
        netif_start_queue(dev);
        return 0;
+ err_del_interface:
+        local->ops->remove_interface(local_to_hw(local), &conf);
+ err_stop:
+        if (!local->open_count && local->ops->stop)
+                local->ops->stop(local_to_hw(local));
+        return res;
 }
 static int ieee80211_stop(struct net_device *dev)
@@ -975,6 +985,7 @@ static int __ieee80211_if_config(struct net_device *dev,
                conf.ssid_len = sdata->u.sta.ssid_len;
        } else if (ieee80211_vif_is_mesh(&sdata->vif)) {
                conf.beacon = beacon;
+                conf.beacon_control = control;
                ieee80211_start_mesh(dev);
        } else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {
                conf.ssid = sdata->u.ap.ssid;
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 594a3356a508..f76bc26ae4d2 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -8,6 +8,7 @@
 * published by the Free Software Foundation.
 */
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "mesh.h"
@@ -167,8 +168,8 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,
        struct rmc_entry *p, *n;
        /* Don't care about endianness since only match matters */
-        memcpy(&seqnum, mesh_hdr->seqnum, sizeof(mesh_hdr->seqnum));
+        memcpy(&seqnum, &mesh_hdr->seqnum, sizeof(mesh_hdr->seqnum));
-        idx = mesh_hdr->seqnum[0] & rmc->idx_mask;
+        idx = le32_to_cpu(mesh_hdr->seqnum) & rmc->idx_mask;
        list_for_each_entry_safe(p, n, &rmc->bucket[idx].list, list) {
                ++entries;
                if (time_after(jiffies, p->exp_time) ||
@@ -393,16 +394,8 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
 {
        meshhdr->flags = 0;
        meshhdr->ttl = sdata->u.sta.mshcfg.dot11MeshTTL;
+        put_unaligned(cpu_to_le32(sdata->u.sta.mesh_seqnum), &meshhdr->seqnum);
-        meshhdr->seqnum[0] = sdata->u.sta.mesh_seqnum[0]++;
+        sdata->u.sta.mesh_seqnum++;
-        meshhdr->seqnum[1] = sdata->u.sta.mesh_seqnum[1];
-        meshhdr->seqnum[2] = sdata->u.sta.mesh_seqnum[2];
-        if (sdata->u.sta.mesh_seqnum[0] == 0) {
-                sdata->u.sta.mesh_seqnum[1]++;
-                if (sdata->u.sta.mesh_seqnum[1] == 0)
-                        sdata->u.sta.mesh_seqnum[2]++;
-        }
        return 5;
 }
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 9ee3affab346..2e161f6d8288 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -140,7 +140,7 @@ struct rmc_entry {
 struct mesh_rmc {
        struct rmc_entry bucket[RMC_BUCKETS];
-        u8 idx_mask;
+        u32 idx_mask;
 };
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index dddbfd60f351..09093da24af6 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -230,10 +230,8 @@ void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
        iv16 = data[hdr_len] << 8;
        iv16 += data[hdr_len + 2];
-        iv32 = data[hdr_len + 4] +
+        iv32 = data[hdr_len + 4] | (data[hdr_len + 5] << 8) |
-                (data[hdr_len + 5] >> 8) +
+               (data[hdr_len + 6] << 16) | (data[hdr_len + 7] << 24);
-                (data[hdr_len + 6] >> 16) +
-                (data[hdr_len + 7] >> 24);
 #ifdef CONFIG_TKIP_DEBUG
        printk(KERN_DEBUG "TKIP encrypt: iv16 = 0x%04x, iv32 = 0x%08x\n",
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index b59871f6bdda..46ea542d0df9 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -296,11 +296,11 @@ static int nf_conntrack_standalone_init_proc(void)
        pde = proc_net_fops_create(&init_net, "nf_conntrack", 0440, &ct_file_ops);
        if (!pde)
                goto out_nf_conntrack;
-        pde = create_proc_entry("nf_conntrack", S_IRUGO, init_net.proc_net_stat);
+        pde = proc_create("nf_conntrack", S_IRUGO, init_net.proc_net_stat,
+                          &ct_cpu_seq_fops);
        if (!pde)
                goto out_stat_nf_conntrack;
-        pde->proc_fops = &ct_cpu_seq_fops;
-        pde->owner = THIS_MODULE;
        return 0;
 out_stat_nf_conntrack:
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 11b22abc2b70..5d75cd86ebb3 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -936,25 +936,24 @@ int xt_proto_init(struct net *net, int af)
 #ifdef CONFIG_PROC_FS
        strlcpy(buf, xt_prefix[af], sizeof(buf));
        strlcat(buf, FORMAT_TABLES, sizeof(buf));
-        proc = proc_net_fops_create(net, buf, 0440, &xt_table_ops);
+        proc = proc_create_data(buf, 0440, net->proc_net, &xt_table_ops,
+                                (void *)(unsigned long)af);
        if (!proc)
                goto out;
-        proc->data = (void *)(unsigned long)af;
        strlcpy(buf, xt_prefix[af], sizeof(buf));
        strlcat(buf, FORMAT_MATCHES, sizeof(buf));
-        proc = proc_net_fops_create(net, buf, 0440, &xt_match_ops);
+        proc = proc_create_data(buf, 0440, net->proc_net, &xt_match_ops,
+                                (void *)(unsigned long)af);
        if (!proc)
                goto out_remove_tables;
-        proc->data = (void *)(unsigned long)af;
        strlcpy(buf, xt_prefix[af], sizeof(buf));
        strlcat(buf, FORMAT_TARGETS, sizeof(buf));
-        proc = proc_net_fops_create(net, buf, 0440, &xt_target_ops);
+        proc = proc_create_data(buf, 0440, net->proc_net, &xt_target_ops,
+                                (void *)(unsigned long)af);
        if (!proc)
                goto out_remove_matches;
-        proc->data = (void *)(unsigned long)af;
 #endif
        return 0;
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 40d344b21453..6809af542a2c 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -237,15 +237,15 @@ static int htable_create_v0(struct xt_hashlimit_info *minfo, int family)
        hinfo->family = family;
        hinfo->rnd_initialized = 0;
        spin_lock_init(&hinfo->lock);
-        hinfo->pde = proc_create(minfo->name, 0,
+        hinfo->pde =
+                proc_create_data(minfo->name, 0,
                                 family == AF_INET ? hashlimit_procdir4 :
                                                     hashlimit_procdir6,
-                                 &dl_file_ops);
+                                 &dl_file_ops, hinfo);
        if (!hinfo->pde) {
                vfree(hinfo);
                return -1;
        }
-        hinfo->pde->data = hinfo;
        setup_timer(&hinfo->timer, htable_gc, (unsigned long )hinfo);
        hinfo->timer.expires = jiffies + msecs_to_jiffies(hinfo->cfg.gc_interval);
@@ -301,15 +301,15 @@ static int htable_create(struct xt_hashlimit_mtinfo1 *minfo,
        hinfo->rnd_initialized = 0;
        spin_lock_init(&hinfo->lock);
-        hinfo->pde = proc_create(minfo->name, 0,
+        hinfo->pde =
+                proc_create_data(minfo->name, 0,
                                 family == AF_INET ? hashlimit_procdir4 :
                                                     hashlimit_procdir6,
-                                 &dl_file_ops);
+                                 &dl_file_ops, hinfo);
        if (hinfo->pde == NULL) {
                vfree(hinfo);
                return -1;
        }
-        hinfo->pde->data = hinfo;
        setup_timer(&hinfo->timer, htable_gc, (unsigned long)hinfo);
        hinfo->timer.expires = jiffies + msecs_to_jiffies(hinfo->cfg.gc_interval);
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 5053a53ba24f..bd593871c81e 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -1066,12 +1066,12 @@ out:
 #ifdef CONFIG_PROC_FS
 static void *rose_node_start(struct seq_file *seq, loff_t *pos)
-        __acquires(rose_neigh_list_lock)
+        __acquires(rose_node_list_lock)
 {
        struct rose_node *rose_node;
        int i = 1;
-        spin_lock_bh(&rose_neigh_list_lock);
+        spin_lock_bh(&rose_node_list_lock);
        if (*pos == 0)
                return SEQ_START_TOKEN;
@@ -1090,9 +1090,9 @@ static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 static void rose_node_stop(struct seq_file *seq, void *v)
-        __releases(rose_neigh_list_lock)
+        __releases(rose_node_list_lock)
 {
-        spin_unlock_bh(&rose_neigh_list_lock);
+        spin_unlock_bh(&rose_node_list_lock);
 }
 static int rose_node_show(struct seq_file *seq, void *v)
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
index bb282a6a19f0..64069c8769a5 100644
--- a/net/rxrpc/ar-transport.c
+++ b/net/rxrpc/ar-transport.c
@@ -184,12 +184,13 @@ void rxrpc_put_transport(struct rxrpc_transport *trans)
        ASSERTCMP(atomic_read(&trans->usage), >, 0);
        trans->put_time = get_seconds();
-        if (unlikely(atomic_dec_and_test(&trans->usage)))
+        if (unlikely(atomic_dec_and_test(&trans->usage))) {
                _debug("zombie");
                /* let the reaper determine the timeout to avoid a race with
                 * overextending the timeout if the reaper is running at the
                 * same time */
                rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
+        }
        _leave("");
 }
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index b741618e4d54..d355e5e47fe3 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -219,6 +219,7 @@ static void dev_watchdog(unsigned long arg)
                                printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n",
                                       dev->name);
                                dev->tx_timeout(dev);
+                                WARN_ON_ONCE(1);
                        }
                        if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + dev->watchdog_timeo)))
                                dev_hold(dev);
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index d75530ff2a6d..c9966713282a 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -316,31 +316,28 @@ static int create_cache_proc_entries(struct cache_detail *cd)
        cd->proc_ent->owner = cd->owner;
        cd->channel_ent = cd->content_ent = NULL;
-        p = proc_create("flush", S_IFREG|S_IRUSR|S_IWUSR,
+        p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR,
-                        cd->proc_ent, &cache_flush_operations);
+                             cd->proc_ent, &cache_flush_operations, cd);
        cd->flush_ent = p;
        if (p == NULL)
                goto out_nomem;
        p->owner = cd->owner;
-        p->data = cd;
        if (cd->cache_request || cd->cache_parse) {
-                p = proc_create("channel", S_IFREG|S_IRUSR|S_IWUSR,
+                p = proc_create_data("channel", S_IFREG|S_IRUSR|S_IWUSR,
-                                cd->proc_ent, &cache_file_operations);
+                                     cd->proc_ent, &cache_file_operations, cd);
                cd->channel_ent = p;
                if (p == NULL)
                        goto out_nomem;
                p->owner = cd->owner;
-                p->data = cd;
        }
        if (cd->cache_show) {
-                p = proc_create("content", S_IFREG|S_IRUSR|S_IWUSR,
+                p = proc_create_data("content", S_IFREG|S_IRUSR|S_IWUSR,
-                                cd->proc_ent, &content_file_operations);
+                                cd->proc_ent, &content_file_operations, cd);
                cd->content_ent = p;
                if (p == NULL)
                        goto out_nomem;
                p->owner = cd->owner;
-                p->data = cd;
        }
        return 0;
 out_nomem:
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index c6061a4346c8..50b049c6598a 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -224,16 +224,10 @@ EXPORT_SYMBOL_GPL(rpc_print_iostats);
 static inline struct proc_dir_entry *
 do_register(const char *name, void *data, const struct file_operations *fops)
 {
-        struct proc_dir_entry *ent;
        rpc_proc_init();
        dprintk("RPC:       registering /proc/net/rpc/%s\n", name);
-        ent = proc_create(name, 0, proc_net_rpc, fops);
+        return proc_create_data(name, 0, proc_net_rpc, fops, data);
-        if (ent) {
-                ent->data = data;
-        }
-        return ent;
 }
 struct proc_dir_entry *
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 665e856675a4..b4f0525f91af 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -82,6 +82,6 @@ EXPORT_SYMBOL_GPL(register_net_sysctl_table);
 void unregister_net_sysctl_table(struct ctl_table_header *header)
 {
-        return unregister_sysctl_table(header);
+        unregister_sysctl_table(header);
 }
 EXPORT_SYMBOL_GPL(unregister_net_sysctl_table);