---

yaml --- r: 279211 b: refs/heads/master c: 77eab1e h: refs/heads/master i: 279209: 10f5d38 279207: bb5c692 v: v3
git-mirror · Nov 13, 2011 · 946a449 · 946a449
1 parent a72a71e
commit 946a449
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d93e2c2f2109a3b804fa799079a6dd4d315af857
+refs/heads/master: 77eab1e929c371f98c6a17a8c5f566529d3b0be2
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/core.h b/trunk/drivers/net/wireless/ath/ath6kl/core.h
@@ -391,6 +391,11 @@ struct ath6kl_req_key {
 	u8 key_len;
 };
 
+enum ath6kl_hif_type {
+	ATH6KL_HIF_TYPE_SDIO,
+	ATH6KL_HIF_TYPE_USB,
+};
+
 #define MAX_NUM_VIF	1
 
 /* vif flags info */
@@ -484,6 +489,7 @@ struct ath6kl {
 	int tx_pending[ENDPOINT_MAX];
 	int total_tx_data_pend;
 	struct htc_target *htc_target;
+	enum ath6kl_hif_type hif_type;
 	void *hif_priv;
 	struct list_head vif_list;
 	/* Lock to avoid race in vif_list entries among add/del/traverse */

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/sdio.c b/trunk/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -1237,6 +1237,7 @@ static int ath6kl_sdio_probe(struct sdio_func *func,
 	}
 
 	ar_sdio->ar = ar;
+	ar->hif_type = ATH6KL_HIF_TYPE_SDIO;
 	ar->hif_priv = ar_sdio;
 	ar->hif_ops = &ath6kl_sdio_ops;
 	ar->bmi.max_data_size = 256;