A method of reducing tunneling in a wireless packet network. The method includes defining a home access point for a client station, determining that the client station is being serviced by an access point different from the home access point, deciding if the client station should change its home access point to the access point from which the client station receives service and initiating a change of the home access point of the client station, if so decided.