Here's how you'll be good to go:

Under

Settings -> Internet connections -> Connect automatically

set it to

Wi-Fi

You probably have it set to

Any connection

And it sounds like you don't need 3G, so under

Settings -> Phone -> Network mode

set it to GSM