summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2016-06-25 19:14:16 -0400
committerJohannes Berg <johannes@sipsolutions.net>2016-06-30 12:06:41 +0200
commitefc401f49adf9c53a95f0430496c7a5433612e74 (patch)
treed06ff94b071c58c70e6a333cde68ae7196505aef /init/main.c
parent46f6b06050b736dab4d41494dae27b883cddc365 (diff)
downloadtalos-op-linux-efc401f49adf9c53a95f0430496c7a5433612e74.tar.gz
talos-op-linux-efc401f49adf9c53a95f0430496c7a5433612e74.zip
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>
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud