So I take the the laptop's using the same router to get onto the internet, and that it's working?

May I suggest that you set your computer to use a static IP that's within the valid range of whatever your router's auto-assign range is. Possible a value that wouldn't cause any conflicts too.