diff --git a/[refs] b/[refs] index afc7b72db8b5..ca9f8159308d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4df78904d12850c1c57bfffde8eff5195f3cd4d +refs/heads/master: 7c565b6f8c635fc22535c763e08184379b16920e diff --git a/trunk/drivers/net/wireless/ath/ath6kl/hif.h b/trunk/drivers/net/wireless/ath/ath6kl/hif.h index 35f90a3b5a8b..f17ae57ee303 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/hif.h +++ b/trunk/drivers/net/wireless/ath/ath6kl/hif.h @@ -171,7 +171,6 @@ struct hif_scatter_req { /* total length of entire transfer */ u32 len; - u32 flags; void (*complete) (struct hif_scatter_req *); int status; struct htc_endpoint *ep; diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc.c b/trunk/drivers/net/wireless/ath/ath6kl/htc.c index 95c47bbd1d78..e65de498a825 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/htc.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/htc.c @@ -1563,12 +1563,6 @@ static int htc_issue_rxpkt_bundle(struct htc_target *target, if (scat_req == NULL) goto fail_rx_pkt; - scat_req->flags = 0; - - if (part_bundle) - scat_req->flags |= - HTC_SCAT_REQ_FLG_PART_BNDL; - for (i = 0; i < n_scat_pkt; i++) { int pad_len; diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc.h b/trunk/drivers/net/wireless/ath/ath6kl/htc.h index 16fa7a84a231..ff0ed6fe7ee8 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/htc.h +++ b/trunk/drivers/net/wireless/ath/ath6kl/htc.h @@ -119,10 +119,6 @@ #define HTC_RX_PKT_PART_OF_BUNDLE (1 << 2) #define HTC_RX_PKT_NO_RECYCLE (1 << 3) -/* scatter request flags */ - -#define HTC_SCAT_REQ_FLG_PART_BNDL (1 << 0) - #define NUM_CONTROL_BUFFERS 8 #define NUM_CONTROL_TX_BUFFERS 2 #define NUM_CONTROL_RX_BUFFERS (NUM_CONTROL_BUFFERS - NUM_CONTROL_TX_BUFFERS)