summaryrefslogtreecommitdiff
path: root/wl1271/stad/src/Sta_Management/trafficAdmControl.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2010-04-02 10:02:17 -0700
committerDmitry Shmidt <dimitrysh@google.com>2010-04-02 10:03:20 -0700
commit3bb9a92880f8cda8c242707ad02077f13b009632 (patch)
tree6709c153fc0fe58275f4cff9bafe55dd6f6ffd5f /wl1271/stad/src/Sta_Management/trafficAdmControl.c
parent4187b52505bea1a54f83dcc0aadc180c9f1648ef (diff)
downloadwlan-3bb9a92880f8cda8c242707ad02077f13b009632.tar.gz
wl1271: M5.04 Driver update + Android patches
Change-Id: I9f7a3ac7336b88577b572db1016dd33774225744 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wl1271/stad/src/Sta_Management/trafficAdmControl.c')
-rw-r--r--wl1271/stad/src/Sta_Management/trafficAdmControl.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/wl1271/stad/src/Sta_Management/trafficAdmControl.c b/wl1271/stad/src/Sta_Management/trafficAdmControl.c
index 8ccabc2..180117f 100644
--- a/wl1271/stad/src/Sta_Management/trafficAdmControl.c
+++ b/wl1271/stad/src/Sta_Management/trafficAdmControl.c
@@ -1,7 +1,7 @@
/*
* trafficAdmControl.c
*
- * Copyright(c) 1998 - 2009 Texas Instruments. All rights reserved.
+ * Copyright(c) 1998 - 2010 Texas Instruments. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1167,7 +1167,7 @@ void trafficAdmCtrl_buildTSPec(trafficAdmCtrl_t *pTrafficAdmCtrl,
TI_UINT32 *len)
{
tsInfo_t tsInfo;
- TI_UINT16 nominalMSDUSize;
+ TI_UINT16 nominalMSDUSize, maxMSDUSize;
TI_UINT32 suspensionInterval = 0; /* disable */
@@ -1219,8 +1219,10 @@ void trafficAdmCtrl_buildTSPec(trafficAdmCtrl_t *pTrafficAdmCtrl,
if (pTrafficAdmCtrl->useFixedMsduSize)
nominalMSDUSize |= FIX_MSDU_SIZE;
+ maxMSDUSize = (nominalMSDUSize & (~FIX_MSDU_SIZE));
+
COPY_WLAN_WORD(pDataBuf, &nominalMSDUSize); /* Nominal-MSDU-size. */
- COPY_WLAN_WORD(pDataBuf + 2, &nominalMSDUSize); /* Maximum-MSDU-size. */
+ COPY_WLAN_WORD(pDataBuf + 2, &maxMSDUSize); /* Maximum-MSDU-size. */
COPY_WLAN_LONG(pDataBuf + 4, &pTSpecInfo->uMinimumServiceInterval); /* Minimum service interval */
COPY_WLAN_LONG(pDataBuf + 8, &pTSpecInfo->uMaximumServiceInterval); /* Maximum service interval */
COPY_WLAN_LONG(pDataBuf + 16, &suspensionInterval);