diff options
| author | Amit Shakya <amit.shakya@stericsson.com> | 2011-09-21 14:41:58 +0530 |
|---|---|---|
| committer | Philippe LANGLAIS <philippe.langlais@stericsson.com> | 2011-10-13 10:18:33 +0200 |
| commit | afa3d7b12a74b0583e5c46f8a4d889a2086691ff (patch) | |
| tree | f55225b1c4766938e15962684b760fa5fa0a5cb4 /drivers/staging/cw1200/queue.c | |
| parent | b4fc8cc9749880779001b76c43fc8b90ca71a6b1 (diff) | |
cw1200: Add BT Coexistence support
BT Coexistence support required setting priority to frames for
PTA arbitration FW, parsing SDD file for getting the listen
interval and using the same in assoc request, modifying Tx rate
for PSPOLL and NULL templates (plumbing them)
ST-Ericsson ID: 357776
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10091
Change-Id: I14f05cbcc2f02b85f72dbe820893cef9c3775df7
Signed-off-by: Amit Shakya <amit.shakya@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31602
Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33528
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Tested-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com>
Diffstat (limited to 'drivers/staging/cw1200/queue.c')
| -rw-r--r-- | drivers/staging/cw1200/queue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/cw1200/queue.c b/drivers/staging/cw1200/queue.c index c6eabd12c56..e09984583f6 100644 --- a/drivers/staging/cw1200/queue.c +++ b/drivers/staging/cw1200/queue.c @@ -199,14 +199,15 @@ size_t cw1200_queue_get_num_queued(struct cw1200_queue *queue, } int cw1200_queue_put(struct cw1200_queue *queue, struct cw1200_common *priv, - struct sk_buff *skb, u8 link_id) + struct sk_buff *skb, struct tx_info *txinfo) { int ret; struct wsm_tx *wsm; struct cw1200_queue_stats *stats = queue->stats; + u8 link_id = txinfo->link_id; wsm = (struct wsm_tx *)skb_push(skb, sizeof(struct wsm_tx)); - ret = cw1200_skb_to_wsm(priv, skb, wsm); + ret = cw1200_skb_to_wsm(priv, skb, wsm, txinfo); if (ret) return ret; |