Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

5 files changed, 25 insertions, 75 deletions

diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index d76885223366..75b099ce49c9 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -118,7 +118,7 @@ doit:
         ret = ehea_set_portspeed(port, sp);
 
         if (!ret)
-                ehea_info("%s: Port speed succesfully set: %dMbps "
+                ehea_info("%s: Port speed successfully set: %dMbps "
                           "%s Duplex",
                           port->netdev->name, port->port_speed,
                           port->full_duplex == 1 ? "Full" : "Half");
@@ -134,7 +134,7 @@ static int ehea_nway_reset(struct net_device *dev)
         ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);
 
         if (!ret)
-                ehea_info("%s: Port speed succesfully set: %dMbps "
+                ehea_info("%s: Port speed successfully set: %dMbps "
                           "%s Duplex",
                           port->netdev->name, port->port_speed,
                           port->full_duplex == 1 ? "Full" : "Half");
diff --git a/drivers/net/ehea/ehea_hcall.h b/drivers/net/ehea/ehea_hcall.h
deleted file mode 100644
index 8e7d1c3edc60..000000000000
--- a/drivers/net/ehea/ehea_hcall.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  linux/drivers/net/ehea/ehea_hcall.h
- *
- *  eHEA ethernet device driver for IBM eServer System p
- *
- *  (C) Copyright IBM Corp. 2006
- *
- *  Authors:
- *       Christoph Raisch <raisch@de.ibm.com>
- *       Jan-Bernd Themann <themann@de.ibm.com>
- *       Thomas Klein <tklein@de.ibm.com>
- *
- *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __EHEA_HCALL_H__
-#define __EHEA_HCALL_H__
-
-/**
- * This file contains HCALL defines that are to be included in the appropriate
- * kernel files later
- */
-
-#define H_ALLOC_HEA_RESOURCE   0x278
-#define H_MODIFY_HEA_QP        0x250
-#define H_QUERY_HEA_QP         0x254
-#define H_QUERY_HEA            0x258
-#define H_QUERY_HEA_PORT       0x25C
-#define H_MODIFY_HEA_PORT      0x260
-#define H_REG_BCMC             0x264
-#define H_DEREG_BCMC           0x268
-#define H_REGISTER_HEA_RPAGES  0x26C
-#define H_DISABLE_AND_GET_HEA  0x270
-#define H_GET_HEA_INFO         0x274
-#define H_ADD_CONN             0x284
-#define H_DEL_CONN             0x288
-
-#endif  /* __EHEA_HCALL_H__ */
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 41bd7aeafd82..809ccc9ff09c 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -32,6 +32,7 @@
 #include <linux/udp.h>
 #include <linux/if.h>
 #include <linux/list.h>
+#include <linux/slab.h>
 #include <linux/if_ether.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
@@ -189,8 +190,8 @@ static void ehea_update_firmware_handles(void)
                 for (k = 0; k < EHEA_MAX_PORTS; k++) {
                         struct ehea_port *port = adapter->port[k];
 
-                        if (!port || (port->state != EHEA_PORT_UP)
-                                || (num_ports == 0))
+                        if (!port || (port->state != EHEA_PORT_UP) ||
+                            (num_ports == 0))
                                 continue;
 
                         for (l = 0;
@@ -447,7 +448,9 @@ 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) {
                         q_skba->os_skbs = fill_wqes - i;
                         if (q_skba->os_skbs == q_skba->len - 2) {
@@ -457,7 +460,6 @@ static int ehea_refill_rq_def(struct ehea_port_res *pr,
                         }
                         break;
                 }
-                skb_reserve(skb, NET_IP_ALIGN);
 
                 skb_arr[index] = skb;
                 tmp_addr = ehea_map_vaddr(skb->data);
@@ -500,7 +502,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);
 }
 
 
@@ -508,7 +510,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)
@@ -656,8 +658,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)
@@ -1388,8 +1390,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;
@@ -1966,7 +1968,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
 {
         struct ehea_port *port = netdev_priv(dev);
         struct dev_mc_list *k_mcl_entry;
-        int ret, i;
+        int ret;
 
         if (dev->flags & IFF_PROMISC) {
                 ehea_promiscuous(dev, 1);
@@ -1980,7 +1982,7 @@ static void ehea_set_multicast_list(struct net_device *dev)
         }
         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.
@@ -1989,15 +1991,14 @@ 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++,
-                             k_mcl_entry = k_mcl_entry->next)
+                netdev_for_each_mc_addr(k_mcl_entry, dev)
                         ehea_add_multicast_entry(port, k_mcl_entry->dmi_addr);
 
         }
@@ -2030,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
@@ -2076,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;
diff --git a/drivers/net/ehea/ehea_phyp.h b/drivers/net/ehea/ehea_phyp.h
index f3628c803567..2f8174c248bc 100644
--- a/drivers/net/ehea/ehea_phyp.h
+++ b/drivers/net/ehea/ehea_phyp.h
@@ -33,7 +33,6 @@
 #include <asm/hvcall.h>
 #include "ehea.h"
 #include "ehea_hw.h"
-#include "ehea_hcall.h"
 
 /* Some abbreviations used here:
  *
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index bc7c5b7abb88..a1b4c7e56367 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -27,6 +27,7 @@
  */
 
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include "ehea.h"
 #include "ehea_phyp.h"
 #include "ehea_qmr.h"
@@ -837,8 +838,8 @@ static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
                 hret = ehea_h_register_rpage_mr(adapter->handle, mr->handle, 0,
                                                 0, pt_abs, EHEA_MAX_RPAGE);
 
-                if ((hret != H_SUCCESS)
-                    && (hret != H_PAGE_REGISTERED)) {
+                if ((hret != H_SUCCESS) &&
+                    (hret != H_PAGE_REGISTERED)) {
                         ehea_h_free_resource(adapter->handle, mr->handle,
                                              FORCE_FREE);
                         ehea_error("register_rpage_mr failed");