I reset the router before when i was having problems getting the desktop to connect, that fixed the problem. The desktop computer is wired to the router, only the notebook is wireless.
The only time that I used any CD from Linksys was to get the computer to detect the router, since then I only use windows for anything else (connecting).

Also, when trying to connect to the router through the laptop, the connection status stays 'Waiting for the network...' for a little too long.