diff options
| author | Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> | 2011-08-10 09:11:16 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 10:20:02 +0000 |
| commit | 1d26bee2ea0c2cd8e0ed6171137be2ad8d5bf708 (patch) | |
| tree | 9a997925746a8249ca9b7075b8dc46ca8eaa9f3d | |
| parent | 2ecfeda2f46e69b7ab67c1209621be310187725a (diff) | |
cw1200: Check p2p flag for wsm join and start.
We should check p2p flag setiing in the vif.
p2p flag is used as a hint in WSM join and
start requests and should be set for P2P GO and CLIENT.
ST-Ericsson ID: 359041
Change-Id: I562616674d8e3b354e3c8c59f300516c3318a970
Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29784
Reviewed-by: QABUILD
Tested-by: Janusz DZIEDZIC <janusz.dziedzic@tieto.com>
Reviewed-by: QATEST
Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33519
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
| -rwxr-xr-x | drivers/staging/cw1200/ap.c | 3 | ||||
| -rw-r--r-- | drivers/staging/cw1200/sta.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/cw1200/ap.c b/drivers/staging/cw1200/ap.c index 20a1d61690e..494403dd28d 100755 --- a/drivers/staging/cw1200/ap.c +++ b/drivers/staging/cw1200/ap.c @@ -698,7 +698,8 @@ static int cw1200_start_ap(struct cw1200_common *priv) int ret; struct ieee80211_bss_conf *conf = &priv->vif->bss_conf; struct wsm_start start = { - .mode = WSM_START_MODE_AP, + .mode = priv->vif->p2p ? + WSM_START_MODE_P2P_GO : WSM_START_MODE_AP, .band = (priv->channel->band == IEEE80211_BAND_5GHZ) ? WSM_PHY_BAND_5G : WSM_PHY_BAND_2_4G, .channelNumber = priv->channel->hw_value, diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c index f6227833248..3da13d597ef 100644 --- a/drivers/staging/cw1200/sta.c +++ b/drivers/staging/cw1200/sta.c @@ -1114,6 +1114,9 @@ void cw1200_join_work(struct work_struct *work) memcpy(&join.ssid[0], &ssidie[2], join.ssidLength); } + if (priv->vif->p2p) + join.flags |= WSM_JOIN_FLAGS_P2P_GO; + wsm_flush_tx(priv); WARN_ON(wsm_set_block_ack_policy(priv, |