From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Fri, 3 Oct 2014 18:08:49 +0000 (-0400)
Subject: staging: unisys: get rid of MACARRAY typedef
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9aee8f970dd9a82e468f625eee56f71bfaa7dd52;p=linux-beck.git

staging: unisys: get rid of MACARRAY typedef

Remove the MACARRAY typedef entirely and switch over to u8*[ETH_ALEN],
like everybody else seems to use.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 3c9aadb657d2..0dee798ad4e0 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -26,6 +26,7 @@
 #include <linux/sched.h>
 #include <linux/gfp.h>
 #include <linux/uuid.h>
+#include <linux/if_ether.h>
 
 #include "vmcallinterface.h"
 #include "channel.h"
@@ -53,7 +54,6 @@ extern int (*virt_control_chan_func)(struct guest_msgs *);
 #define CCF_PENDING      2	/* operation still pending */
 extern atomic_t uisutils_registered_services;
 
-typedef unsigned int MACARRAY[MAX_MACADDR_LEN];
 typedef struct ReqHandlerInfo_struct {
 	uuid_le switchTypeGuid;
 	int (*controlfunc)(struct io_msgs *);
@@ -132,7 +132,7 @@ void util_unmap_virt(struct phys_info *sg);
 unsigned char *util_map_virt_atomic(struct phys_info *sg);
 void util_unmap_virt_atomic(void *buf);
 int uislib_server_inject_add_vnic(u32 switchNo, u32 BusNo, u32 numIntPorts,
-				  u32 numExtPorts, MACARRAY pmac[],
+				  u32 numExtPorts, u8 *pmac[ETH_ALEN],
 				  pCHANNEL_HEADER **chan);
 void uislib_server_inject_del_vnic(u32 switchNo, u32 busNo, u32 numIntPorts,
 				   u32 numExtPorts);