From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 18 Dec 2015 22:28:08 +0000 (-0800)
Subject: staging: wilc1000: Merge wilc-branch-arnd into work-testing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e17bc4c4f15ca547ac4de9fb450f68419f8f0ce1;p=linux-beck.git

staging: wilc1000: Merge wilc-branch-arnd into work-testing

This was done to handle two large patch sets that conflicted to be
merged together without forcing each developer to redo their work.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e17bc4c4f15ca547ac4de9fb450f68419f8f0ce1
diff --cc drivers/staging/wilc1000/host_interface.c
index 640cb6bdf523,5bf9a55ce4ea..4acd936fd572
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@@ -3210,15 -3207,15 +3210,15 @@@ int wilc_add_wep_key_bss_ap(struct host
  	return result;
  }
  
- s32 wilc_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
- 		     u8 u8PtkKeylen, const u8 *mac_addr,
- 		     const u8 *pu8RxMic, const u8 *pu8TxMic,
- 		     u8 mode, u8 u8Ciphermode, u8 u8Idx)
 -int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
++int wilc_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
+ 		     u8 ptk_key_len, const u8 *mac_addr,
+ 		     const u8 *rx_mic, const u8 *tx_mic,
+ 		     u8 mode, u8 cipher_mode, u8 index)
  {
- 	s32 result = 0;
+ 	int result = 0;
  	struct host_if_msg msg;
- 	u8 u8KeyLen = u8PtkKeylen;
- 	u32 i;
+ 	u8 key_len = ptk_key_len;
+ 	int i;
  
  	if (!hif_drv) {
  		PRINT_ER("driver is null\n");
@@@ -3275,15 -3273,15 +3276,15 @@@
  	return result;
  }
  
- s32 wilc_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
- 			u8 u8GtkKeylen,	u8 u8KeyIdx,
- 			u32 u32KeyRSClen, const u8 *KeyRSC,
- 			const u8 *pu8RxMic, const u8 *pu8TxMic,
- 			u8 mode, u8 u8Ciphermode)
 -int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
++int wilc_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
+ 			u8 gtk_key_len,	u8 index,
+ 			u32 key_rsc_len, const u8 *key_rsc,
+ 			const u8 *rx_mic, const u8 *tx_mic,
+ 			u8 mode, u8 cipher_mode)
  {
- 	s32 result = 0;
+ 	int result = 0;
  	struct host_if_msg msg;
- 	u8 u8KeyLen = u8GtkKeylen;
+ 	u8 key_len = gtk_key_len;
  
  	if (!hif_drv) {
  		PRINT_ER("driver is null\n");
@@@ -3409,19 -3413,7 +3416,7 @@@ s32 wilc_set_mac_address(struct host_if
  	return result;
  }
  
- s32 host_int_set_start_scan_req(struct host_if_drv *hif_drv, u8 scanSource)
- {
- 	struct wid wid;
- 
- 	wid.id = (u16)WID_START_SCAN_REQ;
- 	wid.type = WID_CHAR;
- 	wid.val = (s8 *)&scanSource;
- 	wid.size = sizeof(char);
- 
- 	return 0;
- }
- 
 -s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
 +s32 wilc_set_join_req(struct host_if_drv *hif_drv, u8 *pu8bssid,
  			  const u8 *pu8ssid, size_t ssidLen,
  			  const u8 *pu8IEs, size_t IEsLen,
  			  wilc_connect_result pfConnectResult, void *pvUserArg,