Minor conflict with the DSA legacy code removal. Signed-off-by: David S. Miller <davem@davemloft.net>