summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-03-02 04:54:14 -0500
committerJohannes Berg <johannes.berg@intel.com>2015-03-04 10:34:14 +0100
commit0df2f6c11813a3e522f72f6998b00ae8e17dd4df (patch)
treecdd357b481d512e09e01cd723d4de6a9b616d7f4 /net
parentcc57ac536a88604824aca1d3c874fd5252f1e867 (diff)
downloadtalos-obmc-linux-0df2f6c11813a3e522f72f6998b00ae8e17dd4df.tar.gz
talos-obmc-linux-0df2f6c11813a3e522f72f6998b00ae8e17dd4df.zip
mesh_plink: fixup type of timeout to match usage
timeout was being passed as int but assigned from u32/u16 values and used as unsigned type. This is really only for better readability. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mesh_plink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 4eefd5df5b05..8465c055a371 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -621,7 +621,7 @@ static void mesh_plink_timer(unsigned long data)
sta->llid, sta->plid, reason);
}
-static inline void mesh_plink_timer_set(struct sta_info *sta, int timeout)
+static inline void mesh_plink_timer_set(struct sta_info *sta, u32 timeout)
{
sta->plink_timer.expires = jiffies + msecs_to_jiffies(timeout);
sta->plink_timer.data = (unsigned long) sta;
OpenPOWER on IntegriCloud