tunnels: fix netns vs proto registration ordering
[safe/jmp/linux-2.6] / drivers / net / ehea / ehea_main.c
index 8e7c165..99e4f83 100644 (file)
@@ -155,6 +155,8 @@ static void ehea_update_firmware_handles(void)
        int num_fw_handles, k, l;
 
        /* Determine number of handles */
+       mutex_lock(&ehea_fw_handles.lock);
+
        list_for_each_entry(adapter, &adapter_list, list) {
                num_adapters++;
 
@@ -176,15 +178,19 @@ static void ehea_update_firmware_handles(void)
        if (num_fw_handles) {
                arr = kzalloc(num_fw_handles * sizeof(*arr), GFP_KERNEL);
                if (!arr)
-                       return;  /* Keep the existing array */
+                       goto out;  /* Keep the existing array */
        } else
                goto out_update;
 
        list_for_each_entry(adapter, &adapter_list, list) {
+               if (num_adapters == 0)
+                       break;
+
                for (k = 0; k < EHEA_MAX_PORTS; k++) {
                        struct ehea_port *port = adapter->port[k];
 
-                       if (!port || (port->state != EHEA_PORT_UP))
+                       if (!port || (port->state != EHEA_PORT_UP) ||
+                           (num_ports == 0))
                                continue;
 
                        for (l = 0;
@@ -207,6 +213,7 @@ static void ehea_update_firmware_handles(void)
                        }
                        arr[i].adh = adapter->handle;
                        arr[i++].fwh = port->qp_eq->fw_handle;
+                       num_ports--;
                }
 
                arr[i].adh = adapter->handle;
@@ -216,16 +223,20 @@ static void ehea_update_firmware_handles(void)
                        arr[i].adh = adapter->handle;
                        arr[i++].fwh = adapter->mr.handle;
                }
+               num_adapters--;
        }
 
 out_update:
        kfree(ehea_fw_handles.arr);
        ehea_fw_handles.arr = arr;
        ehea_fw_handles.num_entries = i;
+out:
+       mutex_unlock(&ehea_fw_handles.lock);
 }
 
 static void ehea_update_bcmc_registrations(void)
 {
+       unsigned long flags;
        struct ehea_bcmc_reg_entry *arr = NULL;
        struct ehea_adapter *adapter;
        struct ehea_mc_list *mc_entry;
@@ -233,6 +244,8 @@ static void ehea_update_bcmc_registrations(void)
        int i = 0;
        int k;
 
+       spin_lock_irqsave(&ehea_bcmc_regs.lock, flags);
+
        /* Determine number of registrations */
        list_for_each_entry(adapter, &adapter_list, list)
                for (k = 0; k < EHEA_MAX_PORTS; k++) {
@@ -250,7 +263,7 @@ static void ehea_update_bcmc_registrations(void)
        if (num_registrations) {
                arr = kzalloc(num_registrations * sizeof(*arr), GFP_ATOMIC);
                if (!arr)
-                       return;  /* Keep the existing array */
+                       goto out;  /* Keep the existing array */
        } else
                goto out_update;
 
@@ -261,6 +274,9 @@ static void ehea_update_bcmc_registrations(void)
                        if (!port || (port->state != EHEA_PORT_UP))
                                continue;
 
+                       if (num_registrations == 0)
+                               goto out_update;
+
                        arr[i].adh = adapter->handle;
                        arr[i].port_id = port->logical_port_id;
                        arr[i].reg_type = EHEA_BCMC_BROADCAST |
@@ -272,9 +288,13 @@ static void ehea_update_bcmc_registrations(void)
                        arr[i].reg_type = EHEA_BCMC_BROADCAST |
                                          EHEA_BCMC_VLANID_ALL;
                        arr[i++].macaddr = port->mac_addr;
+                       num_registrations -= 2;
 
                        list_for_each_entry(mc_entry,
                                            &port->mc_list->list, list) {
+                               if (num_registrations == 0)
+                                       goto out_update;
+
                                arr[i].adh = adapter->handle;
                                arr[i].port_id = port->logical_port_id;
                                arr[i].reg_type = EHEA_BCMC_SCOPE_ALL |
@@ -288,6 +308,7 @@ static void ehea_update_bcmc_registrations(void)
                                                  EHEA_BCMC_MULTICAST |
                                                  EHEA_BCMC_VLANID_ALL;
                                arr[i++].macaddr = mc_entry->macaddr;
+                               num_registrations -= 2;
                        }
                }
        }
@@ -296,6 +317,8 @@ out_update:
        kfree(ehea_bcmc_regs.arr);
        ehea_bcmc_regs.arr = arr;
        ehea_bcmc_regs.num_entries = i;
+out:
+       spin_unlock_irqrestore(&ehea_bcmc_regs.lock, flags);
 }
 
 static struct net_device_stats *ehea_get_stats(struct net_device *dev)
@@ -308,7 +331,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev)
 
        memset(stats, 0, sizeof(*stats));
 
-       cb2 = kzalloc(PAGE_SIZE, GFP_ATOMIC);
+       cb2 = (void *)get_zeroed_page(GFP_ATOMIC);
        if (!cb2) {
                ehea_error("no mem for cb2");
                goto out;
@@ -341,7 +364,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev)
        stats->rx_packets = rx_packets;
 
 out_herr:
-       kfree(cb2);
+       free_page((unsigned long)cb2);
 out:
        return stats;
 }
@@ -370,8 +393,6 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
                                                              EHEA_L_PKT_SIZE);
                        if (!skb_arr_rq1[index]) {
                                pr->rq1_skba.os_skbs = fill_wqes - i;
-                               ehea_error("%s: no mem for skb/%d wqes filled",
-                                          dev->name, i);
                                break;
                        }
                }
@@ -387,26 +408,19 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
        ehea_update_rq1a(pr->qp, adder);
 }
 
-static int ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a)
+static void ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a)
 {
-       int ret = 0;
        struct sk_buff **skb_arr_rq1 = pr->rq1_skba.arr;
        struct net_device *dev = pr->port->netdev;
        int i;
 
        for (i = 0; i < pr->rq1_skba.len; i++) {
                skb_arr_rq1[i] = netdev_alloc_skb(dev, EHEA_L_PKT_SIZE);
-               if (!skb_arr_rq1[i]) {
-                       ehea_error("%s: no mem for skb/%d wqes filled",
-                                  dev->name, i);
-                       ret = -ENOMEM;
-                       goto out;
-               }
+               if (!skb_arr_rq1[i])
+                       break;
        }
        /* Ring doorbell */
        ehea_update_rq1a(pr->qp, nr_rq1a);
-out:
-       return ret;
 }
 
 static int ehea_refill_rq_def(struct ehea_port_res *pr,
@@ -433,15 +447,18 @@ static int ehea_refill_rq_def(struct ehea_port_res *pr,
        max_index_mask = q_skba->len - 1;
        for (i = 0; i < fill_wqes; i++) {
                u64 tmp_addr;
-               struct sk_buff *skb = netdev_alloc_skb(dev, packet_size);
+               struct sk_buff *skb;
+
+               skb = netdev_alloc_skb_ip_align(dev, packet_size);
                if (!skb) {
-                       ehea_error("%s: no mem for skb/%d wqes filled",
-                                  pr->port->netdev->name, i);
                        q_skba->os_skbs = fill_wqes - i;
-                       ret = -ENOMEM;
+                       if (q_skba->os_skbs == q_skba->len - 2) {
+                               ehea_info("%s: rq%i ran dry - no mem for skb",
+                                         pr->port->netdev->name, rq_nr);
+                               ret = -ENOMEM;
+                       }
                        break;
                }
-               skb_reserve(skb, NET_IP_ALIGN);
 
                skb_arr[index] = skb;
                tmp_addr = ehea_map_vaddr(skb->data);
@@ -484,7 +501,7 @@ static int ehea_refill_rq2(struct ehea_port_res *pr, int nr_of_wqes)
 {
        return ehea_refill_rq_def(pr, &pr->rq2_skba, 2,
                                  nr_of_wqes, EHEA_RWQE2_TYPE,
-                                 EHEA_RQ2_PKT_SIZE + NET_IP_ALIGN);
+                                 EHEA_RQ2_PKT_SIZE);
 }
 
 
@@ -492,7 +509,7 @@ static int ehea_refill_rq3(struct ehea_port_res *pr, int nr_of_wqes)
 {
        return ehea_refill_rq_def(pr, &pr->rq3_skba, 3,
                                  nr_of_wqes, EHEA_RWQE3_TYPE,
-                                 EHEA_MAX_PACKET_SIZE + NET_IP_ALIGN);
+                                 EHEA_MAX_PACKET_SIZE);
 }
 
 static inline int ehea_check_cqe(struct ehea_cqe *cqe, int *rq_num)
@@ -529,14 +546,17 @@ static inline struct sk_buff *get_skb_by_index(struct sk_buff **skb_array,
        x &= (arr_len - 1);
 
        pref = skb_array[x];
-       prefetchw(pref);
-       prefetchw(pref + EHEA_CACHE_LINE);
-
-       pref = (skb_array[x]->data);
-       prefetch(pref);
-       prefetch(pref + EHEA_CACHE_LINE);
-       prefetch(pref + EHEA_CACHE_LINE * 2);
-       prefetch(pref + EHEA_CACHE_LINE * 3);
+       if (pref) {
+               prefetchw(pref);
+               prefetchw(pref + EHEA_CACHE_LINE);
+
+               pref = (skb_array[x]->data);
+               prefetch(pref);
+               prefetch(pref + EHEA_CACHE_LINE);
+               prefetch(pref + EHEA_CACHE_LINE * 2);
+               prefetch(pref + EHEA_CACHE_LINE * 3);
+       }
+
        skb = skb_array[skb_index];
        skb_array[skb_index] = NULL;
        return skb;
@@ -553,12 +573,14 @@ static inline struct sk_buff *get_skb_by_index_ll(struct sk_buff **skb_array,
        x &= (arr_len - 1);
 
        pref = skb_array[x];
-       prefetchw(pref);
-       prefetchw(pref + EHEA_CACHE_LINE);
+       if (pref) {
+               prefetchw(pref);
+               prefetchw(pref + EHEA_CACHE_LINE);
 
-       pref = (skb_array[x]->data);
-       prefetchw(pref);
-       prefetchw(pref + EHEA_CACHE_LINE);
+               pref = (skb_array[x]->data);
+               prefetchw(pref);
+               prefetchw(pref + EHEA_CACHE_LINE);
+       }
 
        skb = skb_array[wqe_index];
        skb_array[wqe_index] = NULL;
@@ -635,8 +657,8 @@ static int get_skb_hdr(struct sk_buff *skb, void **iphdr,
 static void ehea_proc_skb(struct ehea_port_res *pr, struct ehea_cqe *cqe,
                          struct sk_buff *skb)
 {
-       int vlan_extracted = (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT)
-               && pr->port->vgrp;
+       int vlan_extracted = ((cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) &&
+                             pr->port->vgrp);
 
        if (use_lro) {
                if (vlan_extracted)
@@ -830,7 +852,7 @@ static int ehea_poll(struct napi_struct *napi, int budget)
        while ((rx != budget) || force_irq) {
                pr->poll_counter = 0;
                force_irq = 0;
-               netif_rx_complete(napi);
+               napi_complete(napi);
                ehea_reset_cq_ep(pr->recv_cq);
                ehea_reset_cq_ep(pr->send_cq);
                ehea_reset_cq_n1(pr->recv_cq);
@@ -841,7 +863,7 @@ static int ehea_poll(struct napi_struct *napi, int budget)
                if (!cqe && !cqe_skb)
                        return rx;
 
-               if (!netif_rx_reschedule(napi))
+               if (!napi_reschedule(napi))
                        return rx;
 
                cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);
@@ -859,7 +881,7 @@ static void ehea_netpoll(struct net_device *dev)
        int i;
 
        for (i = 0; i < port->num_def_qps; i++)
-               netif_rx_schedule(&port->port_res[i].napi);
+               napi_schedule(&port->port_res[i].napi);
 }
 #endif
 
@@ -867,7 +889,7 @@ static irqreturn_t ehea_recv_irq_handler(int irq, void *param)
 {
        struct ehea_port_res *pr = param;
 
-       netif_rx_schedule(&pr->napi);
+       napi_schedule(&pr->napi);
 
        return IRQ_HANDLED;
 }
@@ -915,7 +937,7 @@ int ehea_sense_port_attr(struct ehea_port *port)
        struct hcp_ehea_port_cb0 *cb0;
 
        /* may be called via ehea_neq_tasklet() */
-       cb0 = kzalloc(PAGE_SIZE, GFP_ATOMIC);
+       cb0 = (void *)get_zeroed_page(GFP_ATOMIC);
        if (!cb0) {
                ehea_error("no mem for cb0");
                ret = -ENOMEM;
@@ -996,7 +1018,7 @@ int ehea_sense_port_attr(struct ehea_port *port)
 out_free:
        if (ret || netif_msg_probe(port))
                ehea_dump(cb0, sizeof(*cb0), "ehea_sense_port_attr");
-       kfree(cb0);
+       free_page((unsigned long)cb0);
 out:
        return ret;
 }
@@ -1007,7 +1029,7 @@ int ehea_set_portspeed(struct ehea_port *port, u32 port_speed)
        u64 hret;
        int ret = 0;
 
-       cb4 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb4 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb4) {
                ehea_error("no mem for cb4");
                ret = -ENOMEM;
@@ -1075,7 +1097,7 @@ int ehea_set_portspeed(struct ehea_port *port, u32 port_speed)
        if (!prop_carrier_state || (port->phy_link == EHEA_PHY_LINK_UP))
                netif_carrier_on(port->netdev);
 
-       kfree(cb4);
+       free_page((unsigned long)cb4);
 out:
        return ret;
 }
@@ -1201,11 +1223,11 @@ static int ehea_fill_port_res(struct ehea_port_res *pr)
        int ret;
        struct ehea_qp_init_attr *init_attr = &pr->qp->init_attr;
 
-       ret = ehea_init_fill_rq1(pr, init_attr->act_nr_rwqes_rq1
-                                    - init_attr->act_nr_rwqes_rq2
-                                    - init_attr->act_nr_rwqes_rq3 - 1);
+       ehea_init_fill_rq1(pr, init_attr->act_nr_rwqes_rq1
+                              - init_attr->act_nr_rwqes_rq2
+                              - init_attr->act_nr_rwqes_rq3 - 1);
 
-       ret |= ehea_refill_rq2(pr, init_attr->act_nr_rwqes_rq2 - 1);
+       ret = ehea_refill_rq2(pr, init_attr->act_nr_rwqes_rq2 - 1);
 
        ret |= ehea_refill_rq3(pr, init_attr->act_nr_rwqes_rq3 - 1);
 
@@ -1302,7 +1324,7 @@ static int ehea_configure_port(struct ehea_port *port)
        struct hcp_ehea_port_cb0 *cb0;
 
        ret = -ENOMEM;
-       cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb0 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb0)
                goto out;
 
@@ -1338,7 +1360,7 @@ static int ehea_configure_port(struct ehea_port *port)
        ret = 0;
 
 out_free:
-       kfree(cb0);
+       free_page((unsigned long)cb0);
 out:
        return ret;
 }
@@ -1367,8 +1389,8 @@ out:
 
 int ehea_rem_smrs(struct ehea_port_res *pr)
 {
-       if ((ehea_rem_mr(&pr->send_mr))
-           || (ehea_rem_mr(&pr->recv_mr)))
+       if ((ehea_rem_mr(&pr->send_mr)) ||
+           (ehea_rem_mr(&pr->recv_mr)))
                return -EIO;
        else
                return 0;
@@ -1524,6 +1546,9 @@ static int ehea_clean_portres(struct ehea_port *port, struct ehea_port_res *pr)
 {
        int ret, i;
 
+       if (pr->qp)
+               netif_napi_del(&pr->napi);
+
        ret = ehea_destroy_qp(pr->qp);
 
        if (!ret) {
@@ -1748,7 +1773,7 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa)
                goto out;
        }
 
-       cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb0 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb0) {
                ehea_error("no mem for cb0");
                ret = -ENOMEM;
@@ -1769,8 +1794,6 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa)
 
        memcpy(dev->dev_addr, mac_addr->sa_data, dev->addr_len);
 
-       spin_lock(&ehea_bcmc_regs.lock);
-
        /* Deregister old MAC in pHYP */
        if (port->state == EHEA_PORT_UP) {
                ret = ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
@@ -1791,9 +1814,8 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa)
 
 out_upregs:
        ehea_update_bcmc_registrations();
-       spin_unlock(&ehea_bcmc_regs.lock);
 out_free:
-       kfree(cb0);
+       free_page((unsigned long)cb0);
 out:
        return ret;
 }
@@ -1817,7 +1839,7 @@ static void ehea_promiscuous(struct net_device *dev, int enable)
        if ((enable && port->promisc) || (!enable && !port->promisc))
                return;
 
-       cb7 = kzalloc(PAGE_SIZE, GFP_ATOMIC);
+       cb7 = (void *)get_zeroed_page(GFP_ATOMIC);
        if (!cb7) {
                ehea_error("no mem for cb7");
                goto out;
@@ -1836,7 +1858,7 @@ static void ehea_promiscuous(struct net_device *dev, int enable)
 
        port->promisc = enable;
 out:
-       kfree(cb7);
+       free_page((unsigned long)cb7);
        return;
 }
 
@@ -1953,15 +1975,13 @@ static void ehea_set_multicast_list(struct net_device *dev)
        }
        ehea_promiscuous(dev, 0);
 
-       spin_lock(&ehea_bcmc_regs.lock);
-
        if (dev->flags & IFF_ALLMULTI) {
                ehea_allmulti(dev, 1);
                goto out;
        }
        ehea_allmulti(dev, 0);
 
-       if (dev->mc_count) {
+       if (!netdev_mc_empty(dev)) {
                ret = ehea_drop_multicast_list(dev);
                if (ret) {
                        /* Dropping the current multicast list failed.
@@ -1970,21 +1990,20 @@ static void ehea_set_multicast_list(struct net_device *dev)
                        ehea_allmulti(dev, 1);
                }
 
-               if (dev->mc_count > port->adapter->max_mc_mac) {
+               if (netdev_mc_count(dev) > port->adapter->max_mc_mac) {
                        ehea_info("Mcast registration limit reached (0x%llx). "
                                  "Use ALLMULTI!",
                                  port->adapter->max_mc_mac);
                        goto out;
                }
 
-               for (i = 0, k_mcl_entry = dev->mc_list; i < dev->mc_count; i++,
+               for (i = 0, k_mcl_entry = dev->mc_list; i < netdev_mc_count(dev); i++,
                             k_mcl_entry = k_mcl_entry->next)
                        ehea_add_multicast_entry(port, k_mcl_entry->dmi_addr);
 
        }
 out:
        ehea_update_bcmc_registrations();
-       spin_unlock(&ehea_bcmc_regs.lock);
        return;
 }
 
@@ -2012,8 +2031,8 @@ static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev,
                write_ip_start_end(swqe, skb);
 
                if (iph->protocol == IPPROTO_UDP) {
-                       if ((iph->frag_off & IP_MF)
-                           || (iph->frag_off & IP_OFFSET))
+                       if ((iph->frag_off & IP_MF) ||
+                           (iph->frag_off & IP_OFFSET))
                                /* IP fragment, so don't change cs */
                                swqe->tx_control &= ~EHEA_SWQE_TCP_CHECKSUM;
                        else
@@ -2058,8 +2077,8 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
                        write_tcp_offset_end(swqe, skb);
 
                } else if (iph->protocol == IPPROTO_UDP) {
-                       if ((iph->frag_off & IP_MF)
-                           || (iph->frag_off & IP_OFFSET))
+                       if ((iph->frag_off & IP_MF) ||
+                           (iph->frag_off & IP_OFFSET))
                                /* IP fragment, so don't change cs */
                                swqe->tx_control |= EHEA_SWQE_CRC
                                                 | EHEA_SWQE_IMM_DATA_PRESENT;
@@ -2217,7 +2236,7 @@ static void ehea_vlan_rx_register(struct net_device *dev,
 
        port->vgrp = grp;
 
-       cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb1 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb1) {
                ehea_error("no mem for cb1");
                goto out;
@@ -2228,7 +2247,7 @@ static void ehea_vlan_rx_register(struct net_device *dev,
        if (hret != H_SUCCESS)
                ehea_error("modify_ehea_port failed");
 
-       kfree(cb1);
+       free_page((unsigned long)cb1);
 out:
        return;
 }
@@ -2241,7 +2260,7 @@ static void ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
        int index;
        u64 hret;
 
-       cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb1 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb1) {
                ehea_error("no mem for cb1");
                goto out;
@@ -2262,7 +2281,7 @@ static void ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
        if (hret != H_SUCCESS)
                ehea_error("modify_ehea_port failed");
 out:
-       kfree(cb1);
+       free_page((unsigned long)cb1);
        return;
 }
 
@@ -2276,7 +2295,7 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
 
        vlan_group_set_device(port->vgrp, vid, NULL);
 
-       cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb1 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb1) {
                ehea_error("no mem for cb1");
                goto out;
@@ -2297,7 +2316,7 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
        if (hret != H_SUCCESS)
                ehea_error("modify_ehea_port failed");
 out:
-       kfree(cb1);
+       free_page((unsigned long)cb1);
        return;
 }
 
@@ -2309,7 +2328,7 @@ int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
        u64 dummy64 = 0;
        struct hcp_modify_qp_cb0 *cb0;
 
-       cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb0 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb0) {
                ret = -ENOMEM;
                goto out;
@@ -2372,7 +2391,7 @@ int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
 
        ret = 0;
 out:
-       kfree(cb0);
+       free_page((unsigned long)cb0);
        return ret;
 }
 
@@ -2465,8 +2484,6 @@ static int ehea_up(struct net_device *dev)
        if (port->state == EHEA_PORT_UP)
                return 0;
 
-       mutex_lock(&ehea_fw_handles.lock);
-
        ret = ehea_port_res_setup(port, port->num_def_qps,
                                  port->num_add_tx_qps);
        if (ret) {
@@ -2503,8 +2520,6 @@ static int ehea_up(struct net_device *dev)
                }
        }
 
-       spin_lock(&ehea_bcmc_regs.lock);
-
        ret = ehea_broadcast_reg_helper(port, H_REG_BCMC);
        if (ret) {
                ret = -EIO;
@@ -2526,10 +2541,7 @@ out:
                ehea_info("Failed starting %s. ret=%i", dev->name, ret);
 
        ehea_update_bcmc_registrations();
-       spin_unlock(&ehea_bcmc_regs.lock);
-
        ehea_update_firmware_handles();
-       mutex_unlock(&ehea_fw_handles.lock);
 
        return ret;
 }
@@ -2579,9 +2591,6 @@ static int ehea_down(struct net_device *dev)
        if (port->state == EHEA_PORT_DOWN)
                return 0;
 
-       mutex_lock(&ehea_fw_handles.lock);
-
-       spin_lock(&ehea_bcmc_regs.lock);
        ehea_drop_multicast_list(dev);
        ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
 
@@ -2590,7 +2599,6 @@ static int ehea_down(struct net_device *dev)
        port->state = EHEA_PORT_DOWN;
 
        ehea_update_bcmc_registrations();
-       spin_unlock(&ehea_bcmc_regs.lock);
 
        ret = ehea_clean_all_portres(port);
        if (ret)
@@ -2598,7 +2606,6 @@ static int ehea_down(struct net_device *dev)
                          dev->name, ret);
 
        ehea_update_firmware_handles();
-       mutex_unlock(&ehea_fw_handles.lock);
 
        return ret;
 }
@@ -2664,7 +2671,7 @@ int ehea_stop_qps(struct net_device *dev)
        u64 dummy64 = 0;
        u16 dummy16 = 0;
 
-       cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb0 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb0) {
                ret = -ENOMEM;
                goto out;
@@ -2716,7 +2723,7 @@ int ehea_stop_qps(struct net_device *dev)
 
        ret = 0;
 out:
-       kfree(cb0);
+       free_page((unsigned long)cb0);
 
        return ret;
 }
@@ -2766,7 +2773,7 @@ int ehea_restart_qps(struct net_device *dev)
        u64 dummy64 = 0;
        u16 dummy16 = 0;
 
-       cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb0 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb0) {
                ret = -ENOMEM;
                goto out;
@@ -2819,7 +2826,7 @@ int ehea_restart_qps(struct net_device *dev)
                ehea_refill_rq3(pr, 0);
        }
 out:
-       kfree(cb0);
+       free_page((unsigned long)cb0);
 
        return ret;
 }
@@ -2950,7 +2957,7 @@ int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
        u64 hret;
        int ret;
 
-       cb = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb) {
                ret = -ENOMEM;
                goto out;
@@ -2967,7 +2974,7 @@ int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
        ret = 0;
 
 out_herr:
-       kfree(cb);
+       free_page((unsigned long)cb);
 out:
        return ret;
 }
@@ -2981,7 +2988,7 @@ int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
        *jumbo = 0;
 
        /* (Try to) enable *jumbo frames */
-       cb4 = kzalloc(PAGE_SIZE, GFP_KERNEL);
+       cb4 = (void *)get_zeroed_page(GFP_KERNEL);
        if (!cb4) {
                ehea_error("no mem for cb4");
                ret = -ENOMEM;
@@ -3009,7 +3016,7 @@ int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
                } else
                        ret = -EINVAL;
 
-               kfree(cb4);
+               free_page((unsigned long)cb4);
        }
 out:
        return ret;
@@ -3069,6 +3076,24 @@ static void ehea_unregister_port(struct ehea_port *port)
        of_device_unregister(&port->ofdev);
 }
 
+static const struct net_device_ops ehea_netdev_ops = {
+       .ndo_open               = ehea_open,
+       .ndo_stop               = ehea_stop,
+       .ndo_start_xmit         = ehea_start_xmit,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ehea_netpoll,
+#endif
+       .ndo_get_stats          = ehea_get_stats,
+       .ndo_set_mac_address    = ehea_set_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_multicast_list = ehea_set_multicast_list,
+       .ndo_change_mtu         = ehea_change_mtu,
+       .ndo_vlan_rx_register   = ehea_vlan_rx_register,
+       .ndo_vlan_rx_add_vid    = ehea_vlan_rx_add_vid,
+       .ndo_vlan_rx_kill_vid   = ehea_vlan_rx_kill_vid,
+       .ndo_tx_timeout         = ehea_tx_watchdog,
+};
+
 struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
                                         u32 logical_port_id,
                                         struct device_node *dn)
@@ -3121,28 +3146,16 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
        /* initialize net_device structure */
        memcpy(dev->dev_addr, &port->mac_addr, ETH_ALEN);
 
-       dev->open = ehea_open;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = ehea_netpoll;
-#endif
-       dev->stop = ehea_stop;
-       dev->hard_start_xmit = ehea_start_xmit;
-       dev->get_stats = ehea_get_stats;
-       dev->set_multicast_list = ehea_set_multicast_list;
-       dev->set_mac_address = ehea_set_mac_addr;
-       dev->change_mtu = ehea_change_mtu;
-       dev->vlan_rx_register = ehea_vlan_rx_register;
-       dev->vlan_rx_add_vid = ehea_vlan_rx_add_vid;
-       dev->vlan_rx_kill_vid = ehea_vlan_rx_kill_vid;
+       dev->netdev_ops = &ehea_netdev_ops;
+       ehea_set_ethtool_ops(dev);
+
        dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
                      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
                      | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
                      | NETIF_F_LLTX;
-       dev->tx_timeout = &ehea_tx_watchdog;
        dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
 
        INIT_WORK(&port->reset_task, ehea_reset_port);
-       ehea_set_ethtool_ops(dev);
 
        ret = register_netdev(dev);
        if (ret) {
@@ -3253,7 +3266,7 @@ static ssize_t ehea_probe_port(struct device *dev,
                               struct device_attribute *attr,
                               const char *buf, size_t count)
 {
-       struct ehea_adapter *adapter = dev->driver_data;
+       struct ehea_adapter *adapter = dev_get_drvdata(dev);
        struct ehea_port *port;
        struct device_node *eth_dn = NULL;
        int i;
@@ -3308,7 +3321,7 @@ static ssize_t ehea_remove_port(struct device *dev,
                                struct device_attribute *attr,
                                const char *buf, size_t count)
 {
-       struct ehea_adapter *adapter = dev->driver_data;
+       struct ehea_adapter *adapter = dev_get_drvdata(dev);
        struct ehea_port *port;
        int i;
        u32 logical_port_id;
@@ -3370,7 +3383,6 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
                ehea_error("Invalid ibmebus device probed");
                return -EINVAL;
        }
-       mutex_lock(&ehea_fw_handles.lock);
 
        adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
        if (!adapter) {
@@ -3397,7 +3409,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
 
        adapter->pd = EHEA_PD_ID;
 
-       dev->dev.driver_data = adapter;
+       dev_set_drvdata(&dev->dev, adapter);
 
 
        /* initialize adapter and ports */
@@ -3450,17 +3462,18 @@ out_kill_eq:
        ehea_destroy_eq(adapter->neq);
 
 out_free_ad:
+       list_del(&adapter->list);
        kfree(adapter);
 
 out:
        ehea_update_firmware_handles();
-       mutex_unlock(&ehea_fw_handles.lock);
+
        return ret;
 }
 
 static int __devexit ehea_remove(struct of_device *dev)
 {
-       struct ehea_adapter *adapter = dev->dev.driver_data;
+       struct ehea_adapter *adapter = dev_get_drvdata(&dev->dev);
        int i;
 
        for (i = 0; i < EHEA_MAX_PORTS; i++)
@@ -3473,8 +3486,6 @@ static int __devexit ehea_remove(struct of_device *dev)
 
        flush_scheduled_work();
 
-       mutex_lock(&ehea_fw_handles.lock);
-
        ibmebus_free_irq(adapter->neq->attr.ist1, adapter);
        tasklet_kill(&adapter->neq_tasklet);
 
@@ -3484,7 +3495,6 @@ static int __devexit ehea_remove(struct of_device *dev)
        kfree(adapter);
 
        ehea_update_firmware_handles();
-       mutex_unlock(&ehea_fw_handles.lock);
 
        return 0;
 }
@@ -3518,12 +3528,14 @@ static int ehea_mem_notifier(struct notifier_block *nb,
                /* Readd canceled memory block */
        case MEM_ONLINE:
                ehea_info("memory is going online");
+               set_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
                if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages))
                        return NOTIFY_BAD;
                ehea_rereg_mrs(NULL);
                break;
        case MEM_GOING_OFFLINE:
                ehea_info("memory is going offline");
+               set_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
                if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages))
                        return NOTIFY_BAD;
                ehea_rereg_mrs(NULL);
@@ -3531,6 +3543,9 @@ static int ehea_mem_notifier(struct notifier_block *nb,
        default:
                break;
        }
+
+       ehea_update_firmware_handles();
+
        return NOTIFY_OK;
 }