Makes dhcp work on mainline and downstream kernel. Disables p2p0 on downstream kernel. This isn't working on either kernel anyways. It breaks wifi on the downstream kernel.
