Disclosed is a method that includes receiving, at a layer 2 switch, a first message to establish a fast re-switch tunnel between the layer 2 switch and a standby wireless controller and receiving, at the layer 2 switch, a second message to trigger use of the fast re-switch tunnel. The switch receives data and forwards the data to the standby wireless controller through the fast re-switch tunnel. Once MAC tables are updated for the standby wireless controller, the fast re-switch tunnel can be torn down.