Problems with noise when turning right

Hi I am having problems with my rover 45 when I turn right there is a knocking noise and sometimes when I am driving straight there is a squeaking noise.I have had a look at the nearside front driveshaft as the noise seems to come from there. On looking at the driveshaft everything looks fine except the driveshaft seems to move forwards and backwards slightly. Does this mean that I need a new driveshaft or a inner our outer cv joint. About 3 months ago the cv boot came off the outer cv joint and water got in I re packed it with grease and put the boot back on.I am looking to repair it myself so I do not want to replace the wrong part many thanks for your help