mac80211: fix sta_info mesh timer bug

Browse source

I noticed a bug I introduced when mesh is enabled: sta_info_destroy()
will end up calling cancel_timer() on a timer that has never been
initialized because the timer is only initialized in mesh_plink_alloc(),
not in sta_info_alloc(). This patch moves the initialization of all mesh
related fields into sta_info_alloc(), adds a bit of sanity checking to
the cfg80211 handlers and sta_info_insert() and makes mesh_plink_alloc()
a static helper function that is only used from the mesh plink code.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Luis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

...

This commit is contained in:

Johannes Berg 2008-02-27 09:56:40 +01:00 • committed by John W. Linville

parent dbbea6713d

commit 03e4497ebe

4 changed files with 37 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

net/mac80211/cfg.c

View file

2

net/mac80211/mesh.h

View file

31

net/mac80211/mesh_plink.c

View file

33

net/mac80211/sta_info.c

View file