diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
| commit | ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7 (patch) | |
| tree | 2bef14ef257315aac5502a5d3f90a3417e938182 /drivers/net/wireless/mwifiex/sta_cmd.c | |
| parent | 917d083d48f50537b21c8761e2366bf229ed9f5d (diff) | |
| parent | a006827a152c3f4d09324157096c8f89cf7ddca3 (diff) | |
| download | talos-op-linux-ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7.tar.gz talos-op-linux-ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7.zip | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_cmd.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c index 0f077aaadab6..733de92a4c61 100644 --- a/drivers/net/wireless/mwifiex/sta_cmd.c +++ b/drivers/net/wireless/mwifiex/sta_cmd.c @@ -1647,7 +1647,7 @@ mwifiex_cmd_tdls_oper(struct mwifiex_private *priv, timeout = (void *)(pos + config_len); timeout->header.type = cpu_to_le16(TLV_TYPE_TDLS_IDLE_TIMEOUT); timeout->header.len = cpu_to_le16(sizeof(timeout->value)); - timeout->value = cpu_to_le16(MWIFIEX_TDLS_IDLE_TIMEOUT); + timeout->value = cpu_to_le16(MWIFIEX_TDLS_IDLE_TIMEOUT_IN_SEC); config_len += sizeof(struct mwifiex_ie_types_tdls_idle_timeout); break; |
