MdePkg: Add EFI Wireless MAC Connection II Protocol definitions

This commit also removes common structure definitions between EFI Wireless
MAC Connection Protocol and EFI Wireless MAC Connection II Protocol from
WiFi.h and place them in WiFi2.h.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

MdePkg/Include/Protocol/WiFi.h

@@ -3,7 +3,7 @@
   network applications (and drivers) to establish wireless connection with an access
   point (AP).
 
-  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution. The full text of the license may be found at
@@ -20,6 +20,8 @@
 #ifndef __EFI_WIFI_PROTOCOL_H__
 #define __EFI_WIFI_PROTOCOL_H__
 
+#include <Protocol/WiFi2.h>
+
 #define EFI_WIRELESS_MAC_CONNECTION_PROTOCOL_GUID \
   { \
     0xda55bc9, 0x45f8, 0x4bb4, {0x87, 0x19, 0x52, 0x24, 0xf1, 0x8a, 0x4d, 0x45 } \
@@ -27,16 +29,6 @@
 
 typedef struct _EFI_WIRELESS_MAC_CONNECTION_PROTOCOL EFI_WIRELESS_MAC_CONNECTION_PROTOCOL;
 
-///
-/// EFI_80211_BSS_TYPE
-///
-typedef enum {
-  IeeeInfrastructureBSS,
-  IeeeIndependentBSS,
-  IeeeMeshBSS,
-  IeeeAnyBss
-} EFI_80211_BSS_TYPE;
-
 ///
 /// EFI_80211_ACC_NET_TYPE
 ///
@@ -145,13 +137,6 @@ typedef enum {
   AuthenticateInvalidParameter
 } EFI_80211_AUTHENTICATE_RESULT_CODE;
 
-///
-/// EFI_80211_MAC_ADDRESS
-///
-typedef struct {
-  UINT8                              Addr[6];
-} EFI_80211_MAC_ADDRESS;
-
 ///
 /// EFI_80211_ELEMENT_HEADER
 ///