Revert "Linux 3.4.16"

This reverts commit 90e923c550ce3cffec8dc3ffc216ef49d917f987.
Revert "Linux 3.4.17"

This reverts commit c53eebe7eb33c8866f01decf24cc7220bdd7d62a.
Linux 3.4.16

Conflicts:
	net/ipv6/tcp_ipv6.c