mac80211: use common cleanup for user/!user_mpm
authorBob Copeland <me@bobcopeland.com>
Sat, 25 Jun 2016 23:14:16 +0000 (19:14 -0400)
committerJohannes Berg <johannes@sipsolutions.net>
Thu, 30 Jun 2016 10:06:41 +0000 (12:06 +0200)
commitefc401f49adf9c53a95f0430496c7a5433612e74
treed06ff94b071c58c70e6a333cde68ae7196505aef
parent46f6b06050b736dab4d41494dae27b883cddc365
mac80211: use common cleanup for user/!user_mpm

We've accumulated a couple of different fixes now to mesh_sta_cleanup()
due to the different paths that user_mpm and !user_mpm cases take -- one
fix to flush nexthop paths and one to fix the counting.

The only caller of mesh_plink_deactivate() is mesh_sta_cleanup(), so we
can push the user_mpm checks down into there in order to share more
code.

In doing so, we can remove an extra call to mesh_path_flush_by_nexthop()
and the (unnecessary) call to mesh_accept_plinks_update().  This will
also ensure the powersaving state code gets called in the user_mpm case.

The only cleanup tasks we need to avoid when MPM is in user-space
are sending the peering frames and stopping the plink timer, so wrap
those in the appropriate check.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
net/mac80211/mesh.c
net/mac80211/mesh_plink.c