ath9k: fix race conditions when stop device

[pandora-kernel.git] / drivers / net / wireless / ath / ath9k / htc_hst.h

diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.h b/drivers/net/wireless/ath/ath9k/htc_hst.h
index 07b6509..ecd0187 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_hst.h
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.h
@@ -77,20 +77,6 @@ struct htc_config_pipe_msg {
        u8 credits;
 } __packed;
 
-struct htc_packet {
-       void *pktcontext;
-       u8 *buf;
-       u8 *buf_payload;
-       u32 buflen;
-       u32 payload_len;
-
-       int endpoint;
-       int status;
-
-       void *context;
-       u32 reserved;
-};
-
 struct htc_ep_callbacks {
        void *priv;
        void (*tx) (void *, struct sk_buff *, enum htc_endpoint_id, bool txok);
@@ -123,11 +109,6 @@ struct htc_endpoint {
 #define HTC_CONTROL_BUFFER_SIZE        \
        (HTC_MAX_CONTROL_MESSAGE_LENGTH + sizeof(struct htc_frame_hdr))
 
-struct htc_control_buf {
-       struct htc_packet htc_pkt;
-       u8 buf[HTC_CONTROL_BUFFER_SIZE];
-};
-
 #define HTC_OP_START_WAIT           BIT(0)
 #define HTC_OP_CONFIG_PIPE_CREDITS  BIT(1)
 
@@ -239,7 +220,8 @@ struct htc_target *ath9k_htc_hw_alloc(void *hif_handle,
                                      struct device *dev);
 void ath9k_htc_hw_free(struct htc_target *htc);
 int ath9k_htc_hw_init(struct htc_target *target,
-                     struct device *dev, u16 devid, char *product);
+                     struct device *dev, u16 devid, char *product,
+                     u32 drv_info);
 void ath9k_htc_hw_deinit(struct htc_target *target, bool hot_unplug);
 
 #endif /* HTC_HST_H */