net: ipv4: merge derp fix

Change-Id: I216fbb12f6007afcd54680975c69474609144ee5