Adapt patch by Divy Le Ray <divy@chelsio.com> accepted by David Miller into net-next-2.6. svn path=/dists/trunk/linux-2.6/; revision=13906