5 files changed, 7 insertions, 7 deletions

diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c
index 887a687b1392..b08fd828fc6a 100644
--- a/drivers/staging/ath6kl/htc2/htc.c
+++ b/drivers/staging/ath6kl/htc2/htc.c
@@ -230,7 +230,7 @@ int HTCWaitTarget(HTC_HANDLE HTCHandle)
     HTC_READY_EX_MSG        *pRdyMsg;
 
     struct htc_service_connect_req  connect;
-    HTC_SERVICE_CONNECT_RESP resp;
+    struct htc_service_connect_resp resp;
 
     AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Enter (target:0x%lX) \n", (unsigned long)target));
 
diff --git a/drivers/staging/ath6kl/htc2/htc_services.c b/drivers/staging/ath6kl/htc2/htc_services.c
index 5c092fd3f61a..d1f1c54e5b89 100644
--- a/drivers/staging/ath6kl/htc2/htc_services.c
+++ b/drivers/staging/ath6kl/htc2/htc_services.c
@@ -123,7 +123,7 @@ int HTCSendSetupComplete(HTC_TARGET *target)
 
 int HTCConnectService(HTC_HANDLE               HTCHandle,
                            struct htc_service_connect_req  *pConnectReq,
-                           HTC_SERVICE_CONNECT_RESP *pConnectResp)
+                           struct htc_service_connect_resp *pConnectResp)
 {
     HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
     int                            status = 0;
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h
index f8f00a0600a0..1bc2488788ab 100644
--- a/drivers/staging/ath6kl/include/htc_api.h
+++ b/drivers/staging/ath6kl/include/htc_api.h
@@ -153,14 +153,14 @@ struct htc_service_connect_req {
 #define HTC_LOCAL_CONN_FLAGS_ENABLE_SEND_BUNDLE_PADDING (1 << 0)  /* enable send bundle padding for this endpoint */
 
 /* service connection response information */
-typedef struct _HTC_SERVICE_CONNECT_RESP {
+struct htc_service_connect_resp {
     u8 *pMetaData;         /* caller supplied buffer to optional meta-data */
     u8 BufferLength;       /* length of caller supplied buffer */
     u8 ActualLength;       /* actual length of meta data */
     HTC_ENDPOINT_ID Endpoint;           /* endpoint to communicate over */
     unsigned int    MaxMsgLength;       /* max length of all messages over this endpoint */
     u8 ConnectRespCode;    /* connect response code from target */
-} HTC_SERVICE_CONNECT_RESP;
+};
 
 /* endpoint distribution structure */
 struct htc_endpoint_credit_dist {
@@ -363,7 +363,7 @@ int    HTCAddReceivePkt(HTC_HANDLE HTCHandle, struct htc_packet *pPacket);
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 int    HTCConnectService(HTC_HANDLE HTCHandle,
                               struct htc_service_connect_req  *pReq,
-                              HTC_SERVICE_CONNECT_RESP *pResp);
+                              struct htc_service_connect_resp *pResp);
 /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   @desc: Send an HTC packet
   @function name: HTCSendPkt
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index a7c57e3f3b67..41c66b77e5f6 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -2343,7 +2343,7 @@ static int ar6000_connectservice(AR_SOFTC_T               *ar,
                                       char *pDesc)
 {
     int                 status;
-    HTC_SERVICE_CONNECT_RESP response;
+    struct htc_service_connect_resp response;
 
     do {
 
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
index 35de2fb9f455..7b6339c41e95 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_raw_if.c
@@ -115,7 +115,7 @@ static int ar6000_connect_raw_service(AR_SOFTC_T        *ar,
                                            HTC_RAW_STREAM_ID StreamID)
 {
     int                 status;
-    HTC_SERVICE_CONNECT_RESP response;
+    struct htc_service_connect_resp response;
     u8 streamNo;
     struct htc_service_connect_req  connect;