aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/join.c
diff options
context:
space:
mode:
authorBrajesh Dave <brajeshd@marvell.com>2007-11-20 17:44:28 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:04:53 -0800
commit96287ac4f7b387acbe17e24b5e1bcbf3bc0e75cd (patch)
treef2dff3b7889ff430c66b1331cde0de8c5f6acafb /drivers/net/wireless/libertas/join.c
parent01d77d8d4747d73cfb6daf35cdc906a2db8ded9d (diff)
libertas: configurable beacon interval
Requires firmware version 5.110.19.p0 or newer, available here: http://dev.laptop.org/pub/firmware/libertas/ Signed-off-by: Ashish Shukla <ashishs@marvell.com> Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/join.c')
-rw-r--r--drivers/net/wireless/libertas/join.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 3854d91c90e..ca67524ee8d 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -510,7 +510,9 @@ int lbs_cmd_80211_ad_hoc_start(lbs_private *priv,
/* set the BSS type */
adhs->bsstype = CMD_BSS_TYPE_IBSS;
adapter->mode = IW_MODE_ADHOC;
- adhs->beaconperiod = cpu_to_le16(MRVDRV_BEACON_INTERVAL);
+ if (adapter->beacon_period == 0)
+ adapter->beacon_period = MRVDRV_BEACON_INTERVAL;
+ adhs->beaconperiod = cpu_to_le16(adapter->beacon_period);
/* set Physical param set */
#define DS_PARA_IE_ID 3