drivers/net: Merge s3ve3g changes