Merge branch 'linus' into x86/urgent

[~andy/linux] / 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 191e3c0837a6ccad9aa76f015f82c679790654ae..e1ffbb6bd636049686b3181705b236862004d29f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_hst.h
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +35,7 @@ struct ath9k_htc_hif {
 
        void (*start) (void *hif_handle);
        void (*stop) (void *hif_handle);
+       void (*sta_drain) (void *hif_handle, u8 idx);
        int (*send) (void *hif_handle, u8 pipe, struct sk_buff *buf);
 };
 
@@ -82,21 +83,10 @@ struct htc_ep_callbacks {
        void (*rx) (void *, struct sk_buff *, enum htc_endpoint_id);
 };
 
-#define HTC_TX_QUEUE_SIZE 256
-
-struct htc_txq {
-       struct sk_buff *buf[HTC_TX_QUEUE_SIZE];
-       u32 txqdepth;
-       u16 txbuf_cnt;
-       u16 txq_head;
-       u16 txq_tail;
-};
-
 struct htc_endpoint {
        u16 service_id;
 
        struct htc_ep_callbacks ep_callbacks;
-       struct htc_txq htc_txq;
        u32 max_txqdepth;
        int max_msglen;
 
@@ -209,6 +199,7 @@ int htc_send_epid(struct htc_target *target, struct sk_buff *skb,
                  enum htc_endpoint_id epid);
 void htc_stop(struct htc_target *target);
 void htc_start(struct htc_target *target);
+void htc_sta_drain(struct htc_target *target, u8 idx);
 
 void ath9k_htc_rx_msg(struct htc_target *htc_handle,
                      struct sk_buff *skb, u32 len, u8 pipe_id);